diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-24 22:15:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-24 22:15:55 +0300 |
| commit | e43e50524e6b00522cc7a1deee3eebd7046cde6f (patch) | |
| tree | 619a5013295b324a4d07eaffa3d494f3b6a7bcfb /drivers/net/wireless/brcm80211/brcmfmac/feature.c | |
| parent | a6e95cc718c8916a13f1e1e9d33cacbc5db56c0f (diff) | |
| parent | 6ae4ccfee09efe5baa3951d1c1d27050a46a1469 (diff) | |
| download | linux-e43e50524e6b00522cc7a1deee3eebd7046cde6f.tar.xz | |
Merge tag 'wireless-drivers-for-davem-2015-03-24' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
iwlwifi:
* avoid panic with lots of IBSS stations
* Fix dvm's behavior after suspend resume
* Allow to keep connection after CSA failure
* Remove a noisy by harmless WARN_ON
* New device IDs
rtlwifi:
* fix IOMMU mapping leak in AP mode
brcmfmac:
* disable MBSS feature for BCM43362 to get AP mode working again
ath9k:
* disable Transmit Power Control (TPC) again due to regressions
* fix beaconing issue with AP+STA setup
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/feature.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/feature.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/brcm80211/brcmfmac/feature.c index defb7a44e0bc..7748a1ccf14f 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/feature.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/feature.c @@ -126,7 +126,8 @@ void brcmf_feat_attach(struct brcmf_pub *drvr) brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_MCHAN, "mchan"); if (drvr->bus_if->wowl_supported) brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_WOWL, "wowl"); - brcmf_feat_iovar_int_set(ifp, BRCMF_FEAT_MBSS, "mbss", 0); + if (drvr->bus_if->chip != BRCM_CC_43362_CHIP_ID) + brcmf_feat_iovar_int_set(ifp, BRCMF_FEAT_MBSS, "mbss", 0); /* set chip related quirks */ switch (drvr->bus_if->chip) { |