diff options
| author | David S. Miller <davem@davemloft.net> | 2019-12-17 04:26:11 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-17 04:26:11 +0100 |
| commit | ad125c6c05921091daf8ac6f01b5665d5401741b (patch) | |
| tree | 2e4b53884b3cde9ad54d759018ba4aec7929a291 /drivers | |
| parent | net: dsa: ocelot: add NET_VENDOR_MICROSEMI dependency (diff) | |
| parent | rfkill: Fix incorrect check to avoid NULL pointer dereference (diff) | |
| download | linux-ad125c6c05921091daf8ac6f01b5665d5401741b.tar.xz linux-ad125c6c05921091daf8ac6f01b5665d5401741b.zip | |
Merge tag 'mac80211-for-net-2019-10-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A handful of fixes:
* disable AQL on most drivers, addressing the iwlwifi issues
* fix double-free on network namespace changes
* fix TID field in frames injected through monitor interfaces
* fix ieee80211_calc_rx_airtime()
* fix NULL pointer dereference in rfkill (and remove BUG_ON)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/mac.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 83cc8778ca1e..978f0037ed52 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -8958,6 +8958,7 @@ int ath10k_mac_register(struct ath10k *ar) wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_VHT_IBSS); wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_SET_SCAN_DWELL); + wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_AQL); if (test_bit(WMI_SERVICE_TX_DATA_ACK_RSSI, ar->wmi.svc_map) || test_bit(WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS, ar->wmi.svc_map)) |