diff mbox series

brcmfmac: fix brcmf_vif_clear_mgmt_ies when stopping AP

Message ID 20241121-brcmfmac-v1-1-02fc3fb427c2@gmail.com
State New
Headers show
Series brcmfmac: fix brcmf_vif_clear_mgmt_ies when stopping AP | expand

Commit Message

Renjaya Raga Zenta Nov. 21, 2024, 7:09 a.m. UTC
This removes the following error log when stopping AP:

ieee80211 phy0: brcmf_vif_set_mgmt_ie: vndr ie set error : -52

It happened if
1) previously wlan interface was in station mode (wpa_supplicant) and
   connected to a hotspot
2) then started AP mode (hostapd)
3) and then stopped AP mode.

The error happened when it tried to clear BRCMF_VNDR_IE_PRBREQ_FLAG.
This flag is not set in `brcmf_config_ap_mgmt_ie`, but
BRCMF_VNDR_IE_ASSOCRSP_FLAG is set instead.

Signed-off-by: Renjaya Raga Zenta <ragazenta@gmail.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


---
base-commit: df8a2f6dc114b2c5c7685a069f717f2b06186b74
change-id: 20241121-brcmfmac-35fb8a1ad221

Best regards,

Comments

Kalle Valo Nov. 21, 2024, 8:13 a.m. UTC | #1
Renjaya Raga Zenta <ragazenta@gmail.com> writes:

> This removes the following error log when stopping AP:
>
> ieee80211 phy0: brcmf_vif_set_mgmt_ie: vndr ie set error : -52
>
> It happened if
> 1) previously wlan interface was in station mode (wpa_supplicant) and
>    connected to a hotspot
> 2) then started AP mode (hostapd)
> 3) and then stopped AP mode.
>
> The error happened when it tried to clear BRCMF_VNDR_IE_PRBREQ_FLAG.
> This flag is not set in `brcmf_config_ap_mgmt_ie`, but
> BRCMF_VNDR_IE_ASSOCRSP_FLAG is set instead.
>
> Signed-off-by: Renjaya Raga Zenta <ragazenta@gmail.com>

'wifi:' missing but I can fix that, no need to resend because of this.
Kalle Valo Dec. 9, 2024, 3:59 p.m. UTC | #2
Renjaya Raga Zenta <ragazenta@gmail.com> wrote:

> This removes the following error log when stopping AP:
> 
> ieee80211 phy0: brcmf_vif_set_mgmt_ie: vndr ie set error : -52
> 
> It happened if:
> 
> 1) previously wlan interface was in station mode (wpa_supplicant) and
>    connected to a hotspot
> 2) then started AP mode (hostapd)
> 3) and then stopped AP mode.
> 
> The error happened when it tried to clear BRCMF_VNDR_IE_PRBREQ_FLAG.
> This flag is not set in `brcmf_config_ap_mgmt_ie`, but
> BRCMF_VNDR_IE_ASSOCRSP_FLAG is set instead.
> 
> Signed-off-by: Renjaya Raga Zenta <ragazenta@gmail.com>

Patch applied to wireless-next.git, thanks.

aba23b0a6a0d wifi: brcmfmac: fix brcmf_vif_clear_mgmt_ies when stopping AP
diff mbox series

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index e19c14ba35f60433de3702873b0a776945d0e548..ac958848935c920d446b64ac650d40968606cc4d 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -5022,12 +5022,16 @@  s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
 s32 brcmf_vif_clear_mgmt_ies(struct brcmf_cfg80211_vif *vif)
 {
 	static const s32 pktflags[] = {
-		BRCMF_VNDR_IE_PRBREQ_FLAG,
 		BRCMF_VNDR_IE_PRBRSP_FLAG,
 		BRCMF_VNDR_IE_BEACON_FLAG
 	};
 	int i;
 
+	if (vif->wdev.iftype == NL80211_IFTYPE_AP)
+		brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_ASSOCRSP_FLAG, NULL, 0);
+	else
+		brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_PRBREQ_FLAG, NULL, 0);
+
 	for (i = 0; i < ARRAY_SIZE(pktflags); i++)
 		brcmf_vif_set_mgmt_ie(vif, pktflags[i], NULL, 0);