xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cfg80211: don't add non transmitted BSS to 6GHz scanned channels

Browse Source 
[ Upstream commit 5666ee154f4696c011dfa8544aaf5591b6b87515 ]

When adding 6GHz channels to scan request based on reported
co-located APs, don't add channels that have only APs with
"non-transmitted" BSSes if they only match the wildcard SSID since
they will be found by probing the "transmitted" BSS.

Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220202104617.f6ddf099f934.I231e55885d3644f292d00dfe0f42653269f2559e@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Avraham Stern
2022-02-02 10:49:37 +02:00
committed by Greg Kroah-Hartman
parent 9a56e2b271
commit 26a1e4739e
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
net/wireless/scan.c
View File

@@ -702,8 +702,12 @@ static bool cfg80211_find_ssid_match(struct cfg80211_colocated_ap *ap,
for (i = 0; i < request->n_ssids; i++) { for (i = 0; i < request->n_ssids; i++) {
/* wildcard ssid in the scan request */ /* wildcard ssid in the scan request */
if (!request->ssids[i].ssid_len) if (!request->ssids[i].ssid_len) {
if (ap->multi_bss && !ap->transmitted_bssid)
continue;
return true; return true;
}
if (ap->ssid_len && if (ap->ssid_len &&
ap->ssid_len == request->ssids[i].ssid_len) { ap->ssid_len == request->ssids[i].ssid_len) {
@@ -830,6 +834,9 @@ static int cfg80211_scan_6ghz(struct cfg80211_registered_device *rdev)
!cfg80211_find_ssid_match(ap, request)) !cfg80211_find_ssid_match(ap, request))
continue; continue;
if (!request->n_ssids && ap->multi_bss && !ap->transmitted_bssid)
continue;
cfg80211_scan_req_add_chan(request, chan, true); cfg80211_scan_req_add_chan(request, chan, true);
memcpy(scan_6ghz_params->bssid, ap->bssid, ETH_ALEN); memcpy(scan_6ghz_params->bssid, ap->bssid, ETH_ALEN);
scan_6ghz_params->short_ssid = ap->short_ssid; scan_6ghz_params->short_ssid = ap->short_ssid;