| From 01a818f63f805d34e309115d7f4ee1db2167759b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 2 Feb 2022 10:49:37 +0200 |
| Subject: cfg80211: don't add non transmitted BSS to 6GHz scanned channels |
| |
| From: Avraham Stern <avraham.stern@intel.com> |
| |
| [ 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> |
| --- |
| net/wireless/scan.c | 9 ++++++++- |
| 1 file changed, 8 insertions(+), 1 deletion(-) |
| |
| diff --git a/net/wireless/scan.c b/net/wireless/scan.c |
| index 22e92be61938..ea0b768def5e 100644 |
| --- a/net/wireless/scan.c |
| +++ b/net/wireless/scan.c |
| @@ -702,8 +702,12 @@ static bool cfg80211_find_ssid_match(struct cfg80211_colocated_ap *ap, |
| |
| for (i = 0; i < request->n_ssids; i++) { |
| /* 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; |
| + } |
| |
| if (ap->ssid_len && |
| ap->ssid_len == request->ssids[i].ssid_len) { |
| @@ -829,6 +833,9 @@ static int cfg80211_scan_6ghz(struct cfg80211_registered_device *rdev) |
| !cfg80211_find_ssid_match(ap, request)) |
| continue; |
| |
| + if (!request->n_ssids && ap->multi_bss && !ap->transmitted_bssid) |
| + continue; |
| + |
| cfg80211_scan_req_add_chan(request, chan, true); |
| memcpy(scan_6ghz_params->bssid, ap->bssid, ETH_ALEN); |
| scan_6ghz_params->short_ssid = ap->short_ssid; |
| -- |
| 2.35.1 |
| |