Commit e847ffe2 authored by Kieran Frewen's avatar Kieran Frewen Committed by Johannes Berg

cfg80211: retrieve S1G operating channel number

When retrieving the S1G channel number from IEs, we should retrieve
the operating channel instead of the primary channel. The S1G operation
element specifies the main channel of operation as the oper channel,
unlike for HT and HE which specify their main channel of operation as
the primary channel.
Signed-off-by: default avatarKieran Frewen <kieran.frewen@morsemicro.com>
Signed-off-by: default avatarBassem Dawood <bassem@morsemicro.com>
Link: https://lore.kernel.org/r/20220420041321.3788789-1-kieran.frewen@morsemicro.comSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5d087aa7
...@@ -1829,7 +1829,7 @@ int cfg80211_get_ies_channel_number(const u8 *ie, size_t ielen, ...@@ -1829,7 +1829,7 @@ int cfg80211_get_ies_channel_number(const u8 *ie, size_t ielen,
if (tmp && tmp->datalen >= sizeof(struct ieee80211_s1g_oper_ie)) { if (tmp && tmp->datalen >= sizeof(struct ieee80211_s1g_oper_ie)) {
struct ieee80211_s1g_oper_ie *s1gop = (void *)tmp->data; struct ieee80211_s1g_oper_ie *s1gop = (void *)tmp->data;
return s1gop->primary_ch; return s1gop->oper_ch;
} }
} else { } else {
tmp = cfg80211_find_elem(WLAN_EID_DS_PARAMS, ie, ielen); tmp = cfg80211_find_elem(WLAN_EID_DS_PARAMS, ie, ielen);
......
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