summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorKieran Frewen <kieran.frewen@morsemicro.com>2022-04-20 07:13:20 +0300
committerJohannes Berg <johannes.berg@intel.com>2022-05-04 12:33:52 +0300
commite847ffe2d146cfd52980ca688d84358e024a6e70 (patch)
tree0c874b46ecbadfd3a4251f5756e58a0fc851d665 /net
parent5d087aa759eb82b8208411913f6c2158bd85abc0 (diff)
downloadlinux-e847ffe2d146cfd52980ca688d84358e024a6e70.tar.xz
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: Kieran Frewen <kieran.frewen@morsemicro.com> Signed-off-by: Bassem Dawood <bassem@morsemicro.com> Link: https://lore.kernel.org/r/20220420041321.3788789-1-kieran.frewen@morsemicro.com Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 4a6d86432910..6d82bd9eaf8c 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -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)) {
struct ieee80211_s1g_oper_ie *s1gop = (void *)tmp->data;
- return s1gop->primary_ch;
+ return s1gop->oper_ch;
}
} else {
tmp = cfg80211_find_elem(WLAN_EID_DS_PARAMS, ie, ielen);