wifi: iwlwifi: mvm: Remove few redundant 6 GHz scan chan params

- iwl_mvm_scan_umac_chan_flags_v2() computes channel params flags
  that are only relevant for 2.4/5 GHz scan, explicitly clear
  the flags for 6 GHz scan.
- n_aps_override[0] and n_aps_override[1] are not relevant for
  6 GHz scan, remove them.

Signed-off-by: Daniel Gabay <daniel.gabay@intel.com>
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20251110150012.3b4f8ed30498.I014c098e64118fe3adaf6db07816e7df8ea4f79e@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index b588f1dcf20d54e1fee89e47a48e2b0ef4f4eba8..59331f1d144b7a7186973672901fbe2a11dc7d6b 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -2568,16 +2568,16 @@ static int iwl_mvm_scan_umac_v14_and_above(struct iwl_mvm *mvm,
                                               bitmap_ssid,
                                               version);
                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;
+       pb->preq = params->preq;
 
        iwl_mvm_umac_scan_fill_6g_chan_list(mvm, params, pb);
 
+       /* Explicitly clear the flags since most of them are not
+        * relevant for 6 GHz scan.
+        */
+       cp->flags = 0;
        cp->count = iwl_mvm_umac_scan_cfg_channels_v7_6g(mvm, params,
                                                         params->n_channels,
                                                         pb, cp, vif->type,