Commit 5666ee15 authored by Avraham Stern's avatar Avraham Stern Committed by Johannes Berg
Browse files

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



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: default avatarAvraham Stern <avraham.stern@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220202104617.f6ddf099f934.I231e55885d3644f292d00dfe0f42653269f2559e@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 667aa742

net/wireless/scan.c

+8 −1
Original line number Diff line number Diff line
@@ -700,8 +700,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) {
@@ -827,6 +831,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;