diff options
| author | David S. Miller <davem@davemloft.net> | 2019-12-16 19:26:11 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-16 19:26:11 -0800 |
| commit | ad125c6c05921091daf8ac6f01b5665d5401741b (patch) | |
| tree | 2e4b53884b3cde9ad54d759018ba4aec7929a291 /net/mac80211/main.c | |
| parent | 95bed1a9fb2b7ee13b58d0d29710282a62082a89 (diff) | |
| parent | 6fc232db9e8cd50b9b83534de9cd91ace711b2d7 (diff) | |
| download | lwn-ad125c6c05921091daf8ac6f01b5665d5401741b.tar.gz lwn-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 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 6cca0853f183..4c2b5ba3ac09 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -672,9 +672,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, IEEE80211_DEFAULT_AQL_TXQ_LIMIT_H; } - local->airtime_flags = AIRTIME_USE_TX | - AIRTIME_USE_RX | - AIRTIME_USE_AQL; + local->airtime_flags = AIRTIME_USE_TX | AIRTIME_USE_RX; local->aql_threshold = IEEE80211_AQL_THRESHOLD; atomic_set(&local->aql_total_pending_airtime, 0); |