Commit 75bcbd69 authored Sep 18, 2020 by John Crispin Committed by Johannes Berg Sep 18, 2020

mac80211: fix 80 MHz association to 160/80+80 AP on 6 GHz



When trying to associate to an AP support 180 or 80+80 MHz on 6 GHz with a
STA that only has 80 Mhz support the cf2 field inside the chandef will get
set causing the association to fail when trying to validate the chandef.
Fix this by checking the support flags prior to setting cf2.

Fixes: 57fa5e85 ("mac80211: determine chandef from HE 6 GHz operation")
Signed-off-by: John Crispin <john@phrozen.org>
Link: https://lore.kernel.org/r/20200918115304.1135693-1-john@phrozen.org


[reword commit message a bit]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 3bd5c7a2

net/mac80211/util.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -3353,6 +3353,7 @@ bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata,
		he_chandef.center_freq1 =
		ieee80211_channel_to_frequency(he_6ghz_oper->ccfs0,
		NL80211_BAND_6GHZ);
		if (support_80_80 \|\| support_160)
		he_chandef.center_freq2 =
		ieee80211_channel_to_frequency(he_6ghz_oper->ccfs1,
		NL80211_BAND_6GHZ);

Admin message