Commit 75bcbd69 authored by John Crispin's avatar John Crispin Committed by Johannes Berg

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: default avatarJohn Crispin <john@phrozen.org>
Link: https://lore.kernel.org/r/20200918115304.1135693-1-john@phrozen.org
[reword commit message a bit]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3bd5c7a2
...@@ -3353,9 +3353,10 @@ bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata, ...@@ -3353,9 +3353,10 @@ bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata,
he_chandef.center_freq1 = he_chandef.center_freq1 =
ieee80211_channel_to_frequency(he_6ghz_oper->ccfs0, ieee80211_channel_to_frequency(he_6ghz_oper->ccfs0,
NL80211_BAND_6GHZ); NL80211_BAND_6GHZ);
he_chandef.center_freq2 = if (support_80_80 || support_160)
ieee80211_channel_to_frequency(he_6ghz_oper->ccfs1, he_chandef.center_freq2 =
NL80211_BAND_6GHZ); ieee80211_channel_to_frequency(he_6ghz_oper->ccfs1,
NL80211_BAND_6GHZ);
} }
if (!cfg80211_chandef_valid(&he_chandef)) { if (!cfg80211_chandef_valid(&he_chandef)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment