[PATCH wireless-next 0/4] wifi: brcmfmac: apmode related fix

[PATCH wireless-next 0/4] wifi: brcmfmac: apmode related fix

[Ian Lin]

Propose several apmode related patches for better performance and 
fixing issues in certain scenario.

Ian Lin (1):
  wifi: brcmfmac: prevent disable controller in apmode stop

Kurt Lee (1):
  wifi: brcmfmac: Improve the delay during scan

Ting-Ying Li (2):
  wifi: brcmfmac: don't allow arp/nd offload to be enabled if ap mode
    exists
  wifi: brcmfmac: revise SoftAP channel setting

 .../broadcom/brcm80211/brcmfmac/cfg80211.c    | 45 ++++++++++++-------
 .../broadcom/brcm80211/brcmfmac/cfg80211.h    |  1 +
 .../broadcom/brcm80211/brcmfmac/core.c        |  5 +++
 3 files changed, 35 insertions(+), 16 deletions(-)

-- 
2.25.0

[PATCH wireless-next 1/4] wifi: brcmfmac: don't allow arp/nd offload to be enabled if ap mode exists

[Ian Lin]

From: Ting-Ying Li <tingying.li@cypress.com>

Add a check to determine whether arp/nd offload enabling
request is allowed. If there is any interface acts as ap
mode and is operating, reject the request of arp offload
enabling from cfg80211.

Signed-off-by: Ting-Ying Li <tingying.li@cypress.com>
Signed-off-by: Ian Lin <ian.lin@infineon.com>
---
 .../broadcom/brcm80211/brcmfmac/cfg80211.c      | 17 ++++++++++++++++-
 .../broadcom/brcm80211/brcmfmac/cfg80211.h      |  1 +
 .../wireless/broadcom/brcm80211/brcmfmac/core.c |  5 +++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index dc2383faddd1..2e06fd0dbb2a 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -1043,6 +1043,21 @@ void brcmf_set_mpc(struct brcmf_if *ifp, int mpc)
 	}
 }
 
+bool brcmf_is_apmode_operating(struct wiphy *wiphy)
+{
+	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+	struct brcmf_cfg80211_vif *vif;
+	bool ret = false;
+
+	list_for_each_entry(vif, &cfg->vif_list, list) {
+		if (brcmf_is_apmode(vif) &&
+		    test_bit(BRCMF_VIF_STATUS_AP_CREATED, &vif->sme_state))
+			ret = true;
+	}
+
+	return ret;
+}
+
 static void brcmf_scan_params_v2_to_v1(struct brcmf_scan_params_v2_le *params_v2_le,
 				       struct brcmf_scan_params_le *params_le)
 {
@@ -5416,8 +5431,8 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev,
 			bphy_err(drvr, "bss_enable config failed %d\n", err);
 	}
 	brcmf_set_mpc(ifp, 1);
-	brcmf_configure_arp_nd_offload(ifp, true);
 	clear_bit(BRCMF_VIF_STATUS_AP_CREATED, &ifp->vif->sme_state);
+	brcmf_configure_arp_nd_offload(ifp, true);
 	brcmf_net_setcarrier(ifp, false);
 
 	return err;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
index b83485ec7b87..273c80f2d483 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
@@ -487,6 +487,7 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
 				struct brcmf_if *ifp, bool aborted,
 				bool fw_abort);
 void brcmf_set_mpc(struct brcmf_if *ndev, int mpc);
+bool brcmf_is_apmode_operating(struct wiphy *wiphy);
 void brcmf_abort_scanning(struct brcmf_cfg80211_info *cfg);
 void brcmf_cfg80211_free_netdev(struct net_device *ndev);
 
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
index 04f41c09deca..862a0336a0b5 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
@@ -98,6 +98,11 @@ void brcmf_configure_arp_nd_offload(struct brcmf_if *ifp, bool enable)
 	s32 err;
 	u32 mode;
 
+	if (enable && brcmf_is_apmode_operating(ifp->drvr->wiphy)) {
+		brcmf_dbg(TRACE, "Skip ARP/ND offload enable when soft AP is running\n");
+		return;
+	}
+
 	if (enable)
 		mode = BRCMF_ARP_OL_AGENT | BRCMF_ARP_OL_PEER_AUTO_REPLY;
 	else
-- 
2.25.0

Re: [PATCH wireless-next 1/4] wifi: brcmfmac: don't allow arp/nd offload to be enabled if ap mode exists

[Arend van Spriel]

On 6/4/2025 11:16 AM, Ian Lin wrote:
> From: Ting-Ying Li <tingying.li@cypress.com>
> 
> Add a check to determine whether arp/nd offload enabling
> request is allowed. If there is any interface acts as ap
> mode and is operating, reject the request of arp offload
> enabling from cfg80211.

Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> Signed-off-by: Ting-Ying Li <tingying.li@cypress.com>
> Signed-off-by: Ian Lin <ian.lin@infineon.com>
> ---
>   .../broadcom/brcm80211/brcmfmac/cfg80211.c      | 17 ++++++++++++++++-
>   .../broadcom/brcm80211/brcmfmac/cfg80211.h      |  1 +
>   .../wireless/broadcom/brcm80211/brcmfmac/core.c |  5 +++++
>   3 files changed, 22 insertions(+), 1 deletion(-)

Re: [PATCH wireless-next 1/4] wifi: brcmfmac: don't allow arp/nd offload to be enabled if ap mode exists

[Lin Ian (CSS ICW ENG WFS SW WFSW 1)]

On 6/4/2025 6:01 PM, Arend van Spriel wrote:
> Caution: This e-mail originated outside Infineon Technologies. Please 
> be cautious when sharing information or opening attachments especially 
> from unknown senders. Refer to our intranet 
> guide<https://intranet-content.infineon.com/explore/aboutinfineon/rules/informationsecurity/ug/SocialEngineering/Pages/SocialEngineeringElements_en.aspx> 
> to help you identify Phishing email.
>
>
>
> On 6/4/2025 11:16 AM, Ian Lin wrote:
>> From: Ting-Ying Li <tingying.li@cypress.com>
>>
>> Add a check to determine whether arp/nd offload enabling
>> request is allowed. If there is any interface acts as ap
>> mode and is operating, reject the request of arp offload
>> enabling from cfg80211.
>
> Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
>> Signed-off-by: Ting-Ying Li <tingying.li@cypress.com>
>> Signed-off-by: Ian Lin <ian.lin@infineon.com>
>> ---
>>   .../broadcom/brcm80211/brcmfmac/cfg80211.c      | 17 ++++++++++++++++-
>>   .../broadcom/brcm80211/brcmfmac/cfg80211.h      |  1 +
>>   .../wireless/broadcom/brcm80211/brcmfmac/core.c |  5 +++++
>>   3 files changed, 22 insertions(+), 1 deletion(-)

Across the patch set, the 3 can be regarded as abandoned
  - [PATCH wireless-next 4/4] wifi: brcmfmac: prevent disable controller 
in apmode stop --> plan to submit new patch set
  - [PATCH wireless-next 3/4] wifi: brcmfmac: Improve the delay during 
scan --> plan to submit new patch set
  - [PATCH wireless-next 2/4] wifi: brcmfmac: revise SoftAP channel 
setting --> abandon

May I ask if this one is regarded as ack to merge?
  - [PATCH wireless-next 1/4] wifi: brcmfmac: don't allow arp/nd offload 
to be enabled if ap mode exists

Regards,
Ian

Re: [PATCH wireless-next 1/4] wifi: brcmfmac: don't allow arp/nd offload to be enabled if ap mode exists

[Johannes Berg]

On Fri, 2025-06-06 at 16:08 +0800, Lin Ian (CSS ICW ENG WFS SW WFSW 1)
wrote:
> 
> May I ask if this one is regarded as ack to merge?
>   - [PATCH wireless-next 1/4] wifi: brcmfmac: don't allow arp/nd offload 
> to be enabled if ap mode exists

You will need to resend though, I'm not going to get into a business of
trying to poke into patch series to apply them partially.

johannes

[PATCH wireless-next 2/4] wifi: brcmfmac: revise SoftAP channel setting

[Ian Lin]

From: Ting-Ying Li <tingying.li@cypress.com>

Fmac need to update "chanspec" iovar for each SoftAP creation
because firmware will update the chanspec to current bsscfg
for each bss. If it doesn't update then the wrong chanspec
will be shown on the result of 'wl -i [interface] status'
command. No need to handle channel resource reusing for mbss
mode by the host driver, it should be covered by firmware.

Signed-off-by: Ting-Ying Li <tingying.li@cypress.com>
Signed-off-by: Ian Lin <ian.lin@infineon.com>
---
 .../broadcom/brcm80211/brcmfmac/cfg80211.c    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 2e06fd0dbb2a..820dc5fee730 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -5248,17 +5248,17 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
 				 err);
 			goto exit;
 		}
-		if (!mbss) {
-			/* Firmware 10.x requires setting channel after enabling
-			 * AP and before bringing interface up.
-			 */
-			err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
-			if (err < 0) {
-				bphy_err(drvr, "Set Channel failed: chspec=%d, %d\n",
-					 chanspec, err);
-				goto exit;
-			}
+
+		/* Firmware 10.x requires setting channel after enabling
+		 * AP and before bringing interface up.
+		 */
+		err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
+		if (err < 0) {
+			bphy_err(drvr, "Set Channel failed: chspec=%d, %d\n",
+				 chanspec, err);
+			goto exit;
 		}
+
 		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
 		if (err < 0) {
 			bphy_err(drvr, "BRCMF_C_UP error (%d)\n", err);
-- 
2.25.0

Re: [PATCH wireless-next 2/4] wifi: brcmfmac: revise SoftAP channel setting

[Arend van Spriel]

On 6/4/2025 11:16 AM, Ian Lin wrote:
> From: Ting-Ying Li <tingying.li@cypress.com>
> 
> Fmac need to update "chanspec" iovar for each SoftAP creation
> because firmware will update the chanspec to current bsscfg
> for each bss. If it doesn't update then the wrong chanspec
> will be shown on the result of 'wl -i [interface] status'
> command. No need to handle channel resource reusing for mbss
> mode by the host driver, it should be covered by firmware.

Sorry, but the wl utility is irrelevant to upstream driver so that does 
not count as argument for this change. What does iw show?

Regards,
Arend

Re: [PATCH wireless-next 2/4] wifi: brcmfmac: revise SoftAP channel setting

[Lin Ian (CSS ICW ENG WFS SW WFSW 1)]

On 6/4/2025 5:38 PM, Arend van Spriel wrote:
> Caution: This e-mail originated outside Infineon Technologies. Please 
> be cautious when sharing information or opening attachments especially 
> from unknown senders. Refer to our intranet 
> guide<https://intranet-content.infineon.com/explore/aboutinfineon/rules/informationsecurity/ug/SocialEngineering/Pages/SocialEngineeringElements_en.aspx> 
> to help you identify Phishing email.
>
>
>
> On 6/4/2025 11:16 AM, Ian Lin wrote:
>> From: Ting-Ying Li <tingying.li@cypress.com>
>>
>> Fmac need to update "chanspec" iovar for each SoftAP creation
>> because firmware will update the chanspec to current bsscfg
>> for each bss. If it doesn't update then the wrong chanspec
>> will be shown on the result of 'wl -i [interface] status'
>> command. No need to handle channel resource reusing for mbss
>> mode by the host driver, it should be covered by firmware.
>
> Sorry, but the wl utility is irrelevant to upstream driver so that does
> not count as argument for this change. What does iw show?
>
The patch is applied to solve problem in multiple AP scenario.
(the problem may be shown in hostapd/wpa_supplicant)
But I found it may be better to include other patches together for the 
scenario.
Let me collect the information and submit another new patch series.

Regards,
Ian

[PATCH wireless-next 3/4] wifi: brcmfmac: Improve the delay during scan

[Ian Lin]

From: Kurt Lee <kurt.lee@cypress.com>

wpa_supplicant sends NL80211_CMD_GET_SURVEY command every time after
normal scan, which causes brcmfmac surveying each channel again.
Currently brcmfmac implments brcmf_cfg80211_dump_survey focusing on AP
mode, thus this change will return the request other than AP mode.

Signed-off-by: Kurt Lee <kurt.lee@cypress.com>
Signed-off-by: Ian Lin <ian.lin@infineon.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 820dc5fee730..e23cd6fc0f56 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -8122,6 +8122,9 @@ brcmf_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *ndev,
 
 	brcmf_dbg(TRACE, "Enter: channel idx=%d\n", idx);
 
+	if (!brcmf_is_apmode(ifp->vif))
+		return -ENOENT;
+
 	/* Do not run survey when VIF in CONNECTING / CONNECTED states */
 	if ((test_bit(BRCMF_VIF_STATUS_CONNECTING, &ifp->vif->sme_state)) ||
 	    (test_bit(BRCMF_VIF_STATUS_CONNECTED, &ifp->vif->sme_state))) {
-- 
2.25.0

Re: [PATCH wireless-next 3/4] wifi: brcmfmac: Improve the delay during scan

[Arend van Spriel]

On 6/4/2025 11:16 AM, Ian Lin wrote:
> From: Kurt Lee <kurt.lee@cypress.com>
> 
> wpa_supplicant sends NL80211_CMD_GET_SURVEY command every time after
> normal scan, which causes brcmfmac surveying each channel again.
> Currently brcmfmac implments brcmf_cfg80211_dump_survey focusing on AP
> mode, thus this change will return the request other than AP mode.

I am not sure if the driver should make this kind of decision. If 
wpa_supplicant wants to invoke a survey after a scan than we should 
simply comply and give what wpa_supplicant what it requests for. If you 
want to avoid the survey make it a configuration option in 
wpa_supplicant.conf.

Regards,
Arend

> Signed-off-by: Kurt Lee <kurt.lee@cypress.com>
> Signed-off-by: Ian Lin <ian.lin@infineon.com>
> ---
>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +++
>   1 file changed, 3 insertions(+

Re: [PATCH wireless-next 3/4] wifi: brcmfmac: Improve the delay during scan

[Lin Ian (CSS ICW ENG WFS SW WFSW 1)]

On 6/4/2025 5:54 PM, Arend van Spriel wrote:
> Caution: This e-mail originated outside Infineon Technologies. Please 
> be cautious when sharing information or opening attachments especially 
> from unknown senders. Refer to our intranet 
> guide<https://intranet-content.infineon.com/explore/aboutinfineon/rules/informationsecurity/ug/SocialEngineering/Pages/SocialEngineeringElements_en.aspx> 
> to help you identify Phishing email.
>
>
>
> On 6/4/2025 11:16 AM, Ian Lin wrote:
>> From: Kurt Lee <kurt.lee@cypress.com>
>>
>> wpa_supplicant sends NL80211_CMD_GET_SURVEY command every time after
>> normal scan, which causes brcmfmac surveying each channel again.
>> Currently brcmfmac implments brcmf_cfg80211_dump_survey focusing on AP
>> mode, thus this change will return the request other than AP mode.
>
> I am not sure if the driver should make this kind of decision. If
> wpa_supplicant wants to invoke a survey after a scan than we should
> simply comply and give what wpa_supplicant what it requests for. If you
> want to avoid the survey make it a configuration option in
> wpa_supplicant.conf.
>
Got it, ya it's much reasonable to make decision in wpa_supplicant.
We'll check what to do next.
Please abandon the change for now, thank you.

> Regards,
> Arend
>
>> Signed-off-by: Kurt Lee <kurt.lee@cypress.com>
>> Signed-off-by: Ian Lin <ian.lin@infineon.com>
>> ---
>>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +++
>>   1 file changed, 3 insertions(+
Regards,
Ian

[PATCH wireless-next 4/4] wifi: brcmfmac: prevent disable controller in apmode stop

[Ian Lin]

From: Ian Lin <ian.lin-ee@infineon.com>

Wpa_supplicant will firstly call scan before start apmode.
In mbss case, controller will be disabled during stop apmode
so next time it reports fail in starting apmpde.
Fix by removing the disable operation.

Signed-off-by: Ian Lin <ian.lin-ee@infineon.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index e23cd6fc0f56..b4078e74f135 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -5392,11 +5392,6 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev,
 			profile->use_fwauth = BIT(BRCMF_PROFILE_FWAUTH_NONE);
 		}
 
-		if (ifp->vif->mbss) {
-			err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
-			return err;
-		}
-
 		/* First BSS doesn't get a full reset */
 		if (ifp->bsscfgidx == 0)
 			brcmf_fil_iovar_int_set(ifp, "closednet", 0);
-- 
2.25.0

Re: [PATCH wireless-next 4/4] wifi: brcmfmac: prevent disable controller in apmode stop

[Arend van Spriel]

On 6/4/2025 11:16 AM, Ian Lin wrote:
> From: Ian Lin <ian.lin-ee@infineon.com>
> 
> Wpa_supplicant will firstly call scan before start apmode.
> In mbss case, controller will be disabled during stop apmode
> so next time it reports fail in starting apmpde.
> Fix by removing the disable operation.

The function brcmf_cfg80211_stop_ap() is a bit tricky. The flag 
ifp->vif->mbss is set to true only when there are multiple AP interface 
and only for subsequent AP interface. For the first AP interface being 
created the flag is false.

Now looking at the function I suspect there is an assumption that each 
AP interface will be stopped. So for a subsequent AP interfaces is will 
do a BRCMF_C_DOWN and for the first interface it will do other stuff 
below the if statement follwed by BRCMF_C_UP.

Clearly you are solving another scenario here so could you elaborate on 
that?

Regards,
Arend

> Signed-off-by: Ian Lin <ian.lin-ee@infineon.com>
> ---
>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 -----
>   1 file changed, 5 deletions(-)
> 
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> index e23cd6fc0f56..b4078e74f135 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> @@ -5392,11 +5392,6 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev,
>   			profile->use_fwauth = BIT(BRCMF_PROFILE_FWAUTH_NONE);
>   		}
>   
> -		if (ifp->vif->mbss) {
> -			err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
> -			return err;
> -		}
> -
>   		/* First BSS doesn't get a full reset */
>   		if (ifp->bsscfgidx == 0)
>   			brcmf_fil_iovar_int_set(ifp, "closednet", 0);

Re: [PATCH wireless-next 4/4] wifi: brcmfmac: prevent disable controller in apmode stop

[Lin Ian (CSS ICW ENG WFS SW WFSW 1)]

On 6/4/2025 6:25 PM, Arend van Spriel wrote:
> Caution: This e-mail originated outside Infineon Technologies. Please 
> be cautious when sharing information or opening attachments especially 
> from unknown senders. Refer to our intranet 
> guide<https://intranet-content.infineon.com/explore/aboutinfineon/rules/informationsecurity/ug/SocialEngineering/Pages/SocialEngineeringElements_en.aspx> 
> to help you identify Phishing email.
>
>
>
> On 6/4/2025 11:16 AM, Ian Lin wrote:
>> From: Ian Lin <ian.lin-ee@infineon.com>
>>
>> Wpa_supplicant will firstly call scan before start apmode.
>> In mbss case, controller will be disabled during stop apmode
>> so next time it reports fail in starting apmpde.
>> Fix by removing the disable operation.
>
> The function brcmf_cfg80211_stop_ap() is a bit tricky. The flag
> ifp->vif->mbss is set to true only when there are multiple AP interface
> and only for subsequent AP interface. For the first AP interface being
> created the flag is false.
>
> Now looking at the function I suspect there is an assumption that each
> AP interface will be stopped. So for a subsequent AP interfaces is will
> do a BRCMF_C_DOWN and for the first interface it will do other stuff
> below the if statement follwed by BRCMF_C_UP.
>
> Clearly you are solving another scenario here so could you elaborate on
> that?
>
The patch is applied to solve problem in multiple AP scenario.
But I found it may be better to include other patches together for the 
scenario.
Let me collect the information and submit another new patch series.

> Regards,
> Arend
>
>> Signed-off-by: Ian Lin <ian.lin-ee@infineon.com>
>> ---
>>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 -----
>>   1 file changed, 5 deletions(-)
>>
>> diff --git 
>> a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c 
>> b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
>> index e23cd6fc0f56..b4078e74f135 100644
>> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
>> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
>> @@ -5392,11 +5392,6 @@ static int brcmf_cfg80211_stop_ap(struct wiphy 
>> *wiphy, struct net_device *ndev,
>>                       profile->use_fwauth = 
>> BIT(BRCMF_PROFILE_FWAUTH_NONE);
>>               }
>>
>> -             if (ifp->vif->mbss) {
>> -                     err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
>> -                     return err;
>> -             }
>> -
>>               /* First BSS doesn't get a full reset */
>>               if (ifp->bsscfgidx == 0)
>>                       brcmf_fil_iovar_int_set(ifp, "closednet", 0);
>
Regards,
Ian