iwlwifi: mvm: Do not use full SSIDs in 6GHz scan

The scan request processing populated the direct SSIDs
in the FW scan request command also for 6GHz scan, which is not
needed and might result in unexpected behavior.

Fix the code to add the direct SSIDs only in case the scan
is not a 6GHz 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.20210802170640.f465937c7bbf.Ic11a1659ddda850c3ec1b1afbe9e2b9577ac1800@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 0368b7101222c14a202ce499b7a1ade72a5c5916..4899d8f90bab30ab6346653790c75957f8550bf2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -2368,14 +2368,17 @@ static int iwl_mvm_scan_umac_v14(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
        if (ret)
                return ret;
 
-       iwl_mvm_scan_umac_fill_probe_p_v4(params, &scan_p->probe_params,
-                                         &bitmap_ssid);
        if (!params->scan_6ghz) {
+               iwl_mvm_scan_umac_fill_probe_p_v4(params, &scan_p->probe_params,
+                                         &bitmap_ssid);
                iwl_mvm_scan_umac_fill_ch_p_v6(mvm, params, vif,
-                                              &scan_p->channel_params, bitmap_ssid);
+                                      &scan_p->channel_params, bitmap_ssid);
 
                return 0;
+       } else {
+               pb->preq = params->preq;
        }
+
        cp->flags = iwl_mvm_scan_umac_chan_flags_v2(mvm, params, vif);
        cp->n_aps_override[0] = IWL_SCAN_ADWELL_N_APS_GO_FRIENDLY;
        cp->n_aps_override[1] = IWL_SCAN_ADWELL_N_APS_SOCIAL_CHS;