diff options
author | Thomas Pedersen <thomas@adapt-ip.com> | 2020-01-13 21:59:40 -0800 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2020-01-15 11:20:13 +0100 |
commit | 30b2f0be23fb40e58d0ad2caf8702c2a44cda2e1 (patch) | |
tree | 51ec8e0778ca8d37bf69d92c47291891aa51141e /include/linux/ieee80211.h | |
parent | 01afc6fedffb519a98322074c645baa2b0fa041f (diff) | |
download | linux-stable-30b2f0be23fb40e58d0ad2caf8702c2a44cda2e1.tar.gz linux-stable-30b2f0be23fb40e58d0ad2caf8702c2a44cda2e1.tar.bz2 linux-stable-30b2f0be23fb40e58d0ad2caf8702c2a44cda2e1.zip |
mac80211: add ieee80211_is_any_nullfunc()
commit 08a5bdde3812 ("mac80211: consider QoS Null frames for STA_NULLFUNC_ACKED")
Fixed a bug where we failed to take into account a
nullfunc frame can be either non-QoS or QoS. It turns out
there is at least one more bug in
ieee80211_sta_tx_notify(), introduced in
commit 7b6ddeaf27ec ("mac80211: use QoS NDP for AP probing"),
where we forgot to check for the QoS variant and so
assumed the QoS nullfunc frame never went out
Fix this by adding a helper ieee80211_is_any_nullfunc()
which consolidates the check for non-QoS and QoS nullfunc
frames. Replace existing compound conditionals and add a
couple more missing checks for QoS variant.
Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com>
Link: https://lore.kernel.org/r/20200114055940.18502-3-thomas@adapt-ip.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/linux/ieee80211.h')
-rw-r--r-- | include/linux/ieee80211.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index e172d0c7bf74..1c4409b4c012 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -620,6 +620,15 @@ static inline bool ieee80211_is_qos_nullfunc(__le16 fc) } /** + * ieee80211_is_any_nullfunc - check if frame is regular or QoS nullfunc frame + * @fc: frame control bytes in little-endian byteorder + */ +static inline bool ieee80211_is_any_nullfunc(__le16 fc) +{ + return (ieee80211_is_nullfunc(fc) || ieee80211_is_qos_nullfunc(fc)); +} + +/** * ieee80211_is_bufferable_mmpdu - check if frame is bufferable MMPDU * @fc: frame control field in little-endian byteorder */ |