diff options
| author |   Thomas Pedersen <thomas@adapt-ip.com> | 2020-09-21 19:28:07 -0700 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2020-09-28 13:53:05 +0200 |
| commit | 66b0564d7e757a193b6f8c925ae30997814fc026 (patch) | |
| tree | 1692ac83d74ff592bbcd8c2e4d7aa9ccea09c79b /net/wireless | |
| parent | cfg80211: convert S1G beacon to scan results (diff) | |
| download | linux-dev-66b0564d7e757a193b6f8c925ae30997814fc026.tar.xz linux-dev-66b0564d7e757a193b6f8c925ae30997814fc026.zip | |
cfg80211: parse S1G Operation element for BSS channel
Extract the BSS primary channel from the S1G Operation
element.
Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com>
Link: https://lore.kernel.org/r/20200922022818.15855-7-thomas@adapt-ip.com
[remove the goto bits]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/scan.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 777df5751285..8d0e49c46db3 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -1802,15 +1802,24 @@ cfg80211_get_bss_channel(struct wiphy *wiphy, const u8 *ie, size_t ielen, int channel_number = -1; struct ieee80211_channel *alt_channel; - tmp = cfg80211_find_ie(WLAN_EID_DS_PARAMS, ie, ielen); - if (tmp && tmp[1] == 1) { - channel_number = tmp[2]; + if (channel->band == NL80211_BAND_S1GHZ) { + tmp = cfg80211_find_ie(WLAN_EID_S1G_OPERATION, ie, ielen); + if (tmp && tmp[1] >= sizeof(struct ieee80211_s1g_oper_ie)) { + struct ieee80211_s1g_oper_ie *s1gop = (void *)(tmp + 2); + + channel_number = s1gop->primary_ch; + } } else { - tmp = cfg80211_find_ie(WLAN_EID_HT_OPERATION, ie, ielen); - if (tmp && tmp[1] >= sizeof(struct ieee80211_ht_operation)) { - struct ieee80211_ht_operation *htop = (void *)(tmp + 2); + tmp = cfg80211_find_ie(WLAN_EID_DS_PARAMS, ie, ielen); + if (tmp && tmp[1] == 1) { + channel_number = tmp[2]; + } else { + tmp = cfg80211_find_ie(WLAN_EID_HT_OPERATION, ie, ielen); + if (tmp && tmp[1] >= sizeof(struct ieee80211_ht_operation)) { + struct ieee80211_ht_operation *htop = (void *)(tmp + 2); - channel_number = htop->primary_chan; + channel_number = htop->primary_chan; + } } } |