Merge tag 'devprop-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-block.git] / net / wireless / scan.c

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index b888522f133b375982b9b54f6f0ebc097ce73560..b2fdac96bab07fd60a6aeacc9574b34ab582fc71 100644 (file)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -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;