]> git.baikalelectronics.ru Git - kernel.git/commit
mac80211: avoid processing non-S1G elements on S1G band
authorThomas Pedersen <thomas@adapt-ip.com>
Thu, 1 Oct 2020 17:47:48 +0000 (10:47 -0700)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 2 Oct 2020 10:07:24 +0000 (12:07 +0200)
commitcc141d365bcd512619d420fcfb2b3f6a5d136f0b
tree802cf99ad606fe03c4f8247ed9cb95873f012021
parent06302839e37922ec814e81b993b53eec53a1bd05
mac80211: avoid processing non-S1G elements on S1G band

In ieee80211_determine_chantype(), the sband->ht_cap was
being processed before S1G Operation element.  Since the
HT capability element should not be present on the S1G
band, avoid processing potential garbage by moving the
call to ieee80211_apply_htcap_overrides() to after the S1G
block.

Also, in case of a missing S1G Operation element, we would
continue trying to process non-S1G elements (and return
with a channel width of 20MHz). Instead, just assume
primary channel is equal to operating and infer the
operating width from the BSS channel, then return.

Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com>
Link: https://lore.kernel.org/r/20201001174748.24520-1-thomas@adapt-ip.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mlme.c