[V2,1/5] brcmfmac: keep apsta enabled when AP starts with MCHAN feature
diff mbox series

Message ID 1587970803-77700-2-git-send-email-chi-hsien.lin@cypress.com
State Accepted
Commit 774965f22dc740ff470d8f26b9a44c5c92a7715b
Delegated to: Kalle Valo
Headers show
Series
  • brcmfmac: p2p/miracast/apsta fixes
Related show

Commit Message

Chi-Hsien Lin April 27, 2020, 6:59 a.m. UTC
From: Wright Feng <wright.feng@cypress.com>

When starting station mode on wlan0 and AP mode on wlan1, the apsta will
be disabled and cause data stall on wlan0(station). The apsta feature
with MCHAN(Multi-Channel Concurrent) or RSDB(Real Simultaneous
Dual-Band) can make STA+AP work on two bands concurrently.
Because of that, we keep apsta enabled if firmware supports MCHAN or
RSDB features

Signed-off-by: Wright Feng <wright.feng@cypress.com>
Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Kalle Valo May 4, 2020, 9:49 a.m. UTC | #1
Chi-Hsien Lin <chi-hsien.lin@cypress.com> wrote:

> From: Wright Feng <wright.feng@cypress.com>
> 
> When starting station mode on wlan0 and AP mode on wlan1, the apsta will
> be disabled and cause data stall on wlan0(station). The apsta feature
> with MCHAN(Multi-Channel Concurrent) or RSDB(Real Simultaneous
> Dual-Band) can make STA+AP work on two bands concurrently.
> Because of that, we keep apsta enabled if firmware supports MCHAN or
> RSDB features
> 
> Signed-off-by: Wright Feng <wright.feng@cypress.com>
> Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>

5 patches applied to wireless-drivers-next.git, thanks.

774965f22dc7 brcmfmac: keep apsta enabled when AP starts with MCHAN feature
19f557a9b8d1 brcmfmac: remove arp_hostip_clear from brcmf_netdev_stop
d524d5ce3655 brcmfmac: p2p cert 6.1.9-support GOUT handling p2p presence request
053ac9e1438a brcmfmac: only generate random p2p address when needed
2719afcae759 brcmfmac: add vendor ie for association responses

Patch
diff mbox series

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index fa846471dac2..e54f6fa6dc8f 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -4727,7 +4727,8 @@  brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
 
 		if ((dev_role == NL80211_IFTYPE_AP) &&
 		    ((ifp->ifidx == 0) ||
-		     !brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB))) {
+		     (!brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB) &&
+		      !brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN)))) {
 			err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
 			if (err < 0) {
 				bphy_err(drvr, "BRCMF_C_DOWN error %d\n",