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/sta_info.c | |
| parent | 95bed1a9fb2b7ee13b58d0d29710282a62082a89 (diff) | |
| parent | 6fc232db9e8cd50b9b83534de9cd91ace711b2d7 (diff) | |
| download | linux-ad125c6c05921091daf8ac6f01b5665d5401741b.tar.bz2 | |
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/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 8eafd81e97b4..0f5f40678885 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1916,6 +1916,9 @@ void ieee80211_sta_update_pending_airtime(struct ieee80211_local *local, { int tx_pending; + if (!wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) + return; + if (!tx_completed) { if (sta) atomic_add(tx_airtime, |