cfg80211: Support hidden AP discovery over 6GHz band

To discover a hidden AP on the 6GHz band, the probe request
sent to the AP needs to include the AP's SSID, as some APs
would not respond with a probe response based only on short
SSID match.

To support hidden AP discovery over the 6GHz band,
when constructing the specific 6GHz band scan also include
SSIDs that were part of the original scan request, so these
can be used in the probe requests transmitted during scan.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210618133832.218df9d3203c.Ice0f7a2f6a65f1f9710b7898591481baeefaf490@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index a3941b19b516de7b970078fbb16bd998501f909b..f03c7ac8e184de9b0ad38ed2e283732a99c84f60 100644 (file)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -5,7 +5,7 @@
  * Copyright 2008 Johannes Berg <johannes@sipsolutions.net>
  * Copyright 2013-2014  Intel Mobile Communications GmbH
  * Copyright 2016      Intel Deutschland GmbH
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  */
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -757,7 +757,8 @@ static int cfg80211_scan_6ghz(struct cfg80211_registered_device *rdev)
        }
 
        request = kzalloc(struct_size(request, channels, n_channels) +
-                         sizeof(*request->scan_6ghz_params) * count,
+                         sizeof(*request->scan_6ghz_params) * count +
+                         sizeof(*request->ssids) * rdev_req->n_ssids,
                          GFP_KERNEL);
        if (!request) {
                cfg80211_free_coloc_ap_list(&coloc_ap_list);
@@ -848,9 +849,18 @@ skip:
 
        if (request->n_channels) {
                struct cfg80211_scan_request *old = rdev->int_scan_req;
-
                rdev->int_scan_req = request;
 
+               /*
+                * Add the ssids from the parent scan request to the new scan
+                * request, so the driver would be able to use them in its
+                * probe requests to discover hidden APs on PSC channels.
+                */
+               request->ssids = (void *)&request->channels[request->n_channels];
+               request->n_ssids = rdev_req->n_ssids;
+               memcpy(request->ssids, rdev_req->ssids, sizeof(*request->ssids) *
+                      request->n_ssids);
+
                /*
                 * If this scan follows a previous scan, save the scan start
                 * info from the first part of the scan