mac80211: add ieee80211_is_any_nullfunc()
commit 30b2f0be upstream. commit 08a5bdde ("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 7b6ddeaf ("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> Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Showing
- include/linux/ieee80211.h 9 additions, 0 deletionsinclude/linux/ieee80211.h
- net/mac80211/mlme.c 1 addition, 1 deletionnet/mac80211/mlme.c
- net/mac80211/rx.c 3 additions, 5 deletionsnet/mac80211/rx.c
- net/mac80211/status.c 2 additions, 3 deletionsnet/mac80211/status.c
- net/mac80211/tx.c 1 addition, 1 deletionnet/mac80211/tx.c
Please register or sign in to comment