From 454d652082de0ffcee5e1b8ef0d282be5e0be906 Mon Sep 17 00:00:00 2001 From: Carter Chen Date: Mon, 26 Aug 2024 01:53:26 -0500 Subject: [PATCH 291/296] non-upstream: fix kernel warning for Suite-B-192 call set PMK with the line "profile->use_fwsup = INFF_PROFILE_FWSUP_NONE;" it will generate the kernel warning while it calls brcmf_cfg80211_set_pmk correct the length of key in brcmf_wsec_pmk_le to make it align the definition in firmware Signed-off-by: Carter Chen --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 ++- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 77efc805df1a..8d0d4ce7b37d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -2521,7 +2521,8 @@ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme) profile->use_fwsup = BRCMF_PROFILE_FWSUP_ROAM; /*Disable intrnal sup for SuiteB*/ - profile->use_fwsup = BRCMF_PROFILE_FWSUP_NONE; + if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_FWSUP)) + profile->use_fwsup = BRCMF_PROFILE_FWSUP_NONE; break; default: bphy_err(drvr, "invalid akm suite (%d)\n", diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h index cba6dd27d876..683e5e76c8a9 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h @@ -659,7 +659,7 @@ struct brcmf_wsec_key_le { struct brcmf_wsec_pmk_le { __le16 key_len; __le16 flags; - u8 key[2 * BRCMF_WSEC_MAX_PMK_LEN + 1]; + u8 key[BRCMF_WSEC_MAX_PMK_LEN]; }; /** -- 2.25.1