mac80211: backport more brcmfmac changes queued for the 5.1
[openwrt/staging/jogo.git] / package / kernel / mac80211 / patches / brcm / 349-v5.1-0004-brcmfmac-disable-MBSS-feature-for-bcm4330-device.patch
1 From 92d3b88b1029c46f9bf27302c502dc0e3541805b Mon Sep 17 00:00:00 2001
2 From: Arend van Spriel <arend.vanspriel@broadcom.com>
3 Date: Thu, 14 Feb 2019 13:43:50 +0100
4 Subject: [PATCH] brcmfmac: disable MBSS feature for bcm4330 device
5
6 The MBSS feature was already disabled for bcm43362 as it resulted in a
7 beacon with BRCM_TEST_SSID regardless user configuration in hostapd. Now
8 the same has been reported for bcm4330 so disable the feature for this
9 device as well.
10
11 Reported-by: Russell King <linux@armlinux.org.uk>
12 Tested-by: Christopher Martin <chrsmrtn@gmail.com>
13 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
14 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
15 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
16 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
17 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
18 ---
19 .../net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 10 ++++++++--
20 1 file changed, 8 insertions(+), 2 deletions(-)
21
22 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
23 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
24 @@ -272,9 +272,15 @@ void brcmf_feat_attach(struct brcmf_pub
25 BIT(BRCMF_FEAT_WOWL_GTK);
26 }
27 }
28 - /* MBSS does not work for 43362 */
29 - if (drvr->bus_if->chip == BRCM_CC_43362_CHIP_ID)
30 + /* MBSS does not work for all chips */
31 + switch (drvr->bus_if->chip) {
32 + case BRCM_CC_4330_CHIP_ID:
33 + case BRCM_CC_43362_CHIP_ID:
34 ifp->drvr->feat_flags &= ~BIT(BRCMF_FEAT_MBSS);
35 + break;
36 + default:
37 + break;
38 + }
39 brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_RSDB, "rsdb_mode");
40 brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_TDLS, "tdls_enable");
41 brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_MFP, "mfp");