diff options
| author | Thomas Pedersen <thomas@adapt-ip.com> | 2019-11-19 06:35:38 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2019-11-22 13:36:25 +0100 |
| commit | 08a5bdde3812993cb8eb7aa9124703df0de28e4b (patch) | |
| tree | f3623353647b3be3f73ea25a7f222e1be372142a /net | |
| parent | mac80211: expose HW conf flags through debugfs (diff) | |
| download | linux-08a5bdde3812993cb8eb7aa9124703df0de28e4b.tar.xz linux-08a5bdde3812993cb8eb7aa9124703df0de28e4b.zip | |
mac80211: consider QoS Null frames for STA_NULLFUNC_ACKED
Commit 7b6ddeaf27ec ("mac80211: use QoS NDP for AP probing")
let STAs send QoS Null frames as PS triggers if the AP was
a QoS STA. However, the mac80211 PS stack relies on an
interface flag IEEE80211_STA_NULLFUNC_ACKED for
determining trigger frame ACK, which was not being set for
acked non-QoS Null frames. The effect is an inability to
trigger hardware sleep via IEEE80211_CONF_PS since the QoS
Null frame was seemingly never acked.
This bug only applies to drivers which set both
IEEE80211_HW_REPORTS_TX_ACK_STATUS and
IEEE80211_HW_PS_NULLFUNC_STACK.
Detect the acked QoS Null frame to restore STA power save.
Fixes: 7b6ddeaf27ec ("mac80211: use QoS NDP for AP probing")
Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com>
Link: https://lore.kernel.org/r/20191119053538.25979-4-thomas@adapt-ip.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/status.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 0e51def35b8a..7b39ed86a8ad 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -1030,7 +1030,8 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw, I802_DEBUG_INC(local->dot11FailedCount); } - if (ieee80211_is_nullfunc(fc) && ieee80211_has_pm(fc) && + if ((ieee80211_is_nullfunc(fc) || ieee80211_is_qos_nullfunc(fc)) && + ieee80211_has_pm(fc) && ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS) && !(info->flags & IEEE80211_TX_CTL_INJECTED) && local->ps_sdata && !(local->scanning)) { |