diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-31 22:37:30 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-31 22:37:30 +0300 |
| commit | df67e97a2848a1517d010470b8b4f3344ae41f02 (patch) | |
| tree | 0a1f09f14e11b26f1d6e93a70a6318420312fd1f /drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | |
| parent | 46d0847cdd4a3fc1920e56827b9189b9a105d362 (diff) | |
| parent | d3532ea6ce4ea501e421d130555e59edc2945f99 (diff) | |
| download | linux-df67e97a2848a1517d010470b8b4f3344ae41f02.tar.xz | |
Merge tag 'wireless-drivers-for-davem-2016-10-30' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says:
====================
wireless-drivers fixes for 4.9
iwlwifi
* some fixes for suspend/resume with unified FW images
* a fix for a false-positive lockdep report
* a fix for multi-queue that caused an unnecessary 1 second latency
* a fix for an ACPI parsing bug that caused a misleading error message
brcmfmac
* fix a variable uninitialised warning in brcmf_cfg80211_start_ap()
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c')
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index b777e1b2f87a..78d9966a3957 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -4516,7 +4516,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, /* store current 11d setting */ if (brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_REGULATORY, &ifp->vif->is_11d)) { - supports_11d = false; + is_11d = supports_11d = false; } else { country_ie = brcmf_parse_tlvs((u8 *)settings->beacon.tail, settings->beacon.tail_len, |