brcmfmac: disable MBSS feature for bcm4330 device

The MBSS feature was already disabled for bcm43362 as it resulted in a
beacon with BRCM_TEST_SSID regardless user configuration in hostapd. Now
the same has been reported for bcm4330 so disable the feature for this
device as well.

Reported-by: Russell King <linux@armlinux.org.uk>
Tested-by: Christopher Martin <chrsmrtn@gmail.com>
Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
index b91b7ecbfedf406d9532269958859ca0f4b5a7b6..072c51c953a5db8c7b55226faf1b9d85cd9bd9c2 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
@@ -272,9 +272,15 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)
                                        BIT(BRCMF_FEAT_WOWL_GTK);
                }
        }
-       /* MBSS does not work for 43362 */
-       if (drvr->bus_if->chip == BRCM_CC_43362_CHIP_ID)
+       /* MBSS does not work for all chips */
+       switch (drvr->bus_if->chip) {
+       case BRCM_CC_4330_CHIP_ID:
+       case BRCM_CC_43362_CHIP_ID:
                ifp->drvr->feat_flags &= ~BIT(BRCMF_FEAT_MBSS);
+               break;
+       default:
+               break;
+       }
        brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_RSDB, "rsdb_mode");
        brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_TDLS, "tdls_enable");
        brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_MFP, "mfp");