diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-13 11:21:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-13 11:21:25 -0700 |
| commit | 94b18a87efdd1626a1e6aef87271af4a7c616d36 (patch) | |
| tree | cc32a49f7108a9dbc41124514682c9dc8ee76716 /drivers/net/wireless/ti/wlcore/main.c | |
| parent | 242a6df688dcad7c55105280a79aaff83addf7ce (diff) | |
| parent | e2e57291097b289f84e05fa58ab5e6c6f30cc6e2 (diff) | |
Merge tag 'wireless-drivers-2020-03-13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says:
====================
wireless-drivers fixes for v5.6
Third, and hopefully last, set of fixes for v5.6.
iwlwifi
* fix a locking issue in time events handling
* a fix in rate-scaling
* fix for a potential NULL pointer deref
* enable antenna diversity in some devices that were erroneously not doing it
* allow FW dumps to continue when the FW is stuck
* a fix in the HE capabilities handling
* another fix for FW dumps where we were reading wrong addresses
* fix link in MAINTAINERS file
rtlwifi
* fix regression causing connect issues in v5.4
wlcore
* remove merge damage which luckily didn't have any impact on functionality
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ti/wlcore/main.c')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index ed049c9f7e29..f140f7d7f553 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -6274,7 +6274,7 @@ static int wl1271_init_ieee80211(struct wl1271 *wl) wl->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD | WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL | WIPHY_FLAG_HAS_CHANNEL_SWITCH | -+ WIPHY_FLAG_IBSS_RSN; + WIPHY_FLAG_IBSS_RSN; wl->hw->wiphy->features |= NL80211_FEATURE_AP_SCAN; |