iwlwifi: mvm: Fix scan channel flags settings

[ Upstream commit 090f1be3abf3069ef856b29761f181808bf55917 ]

The iwl_mvm_scan_ch_n_aps_flag() is called with a variable
before the value of the variable is set. Fix it.

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.20210826224715.f6f188980a5e.Ie7331a8b94004d308f6cbde44e519155a5be91dd@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 3627de2af3444fa25859e6f471da224850bf6428..ee3aff8bf7c25b4199f712f44310d4e54f0e1047 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -1648,7 +1648,7 @@ iwl_mvm_umac_scan_cfg_channels_v6(struct iwl_mvm *mvm,
                struct iwl_scan_channel_cfg_umac *cfg = &cp->channel_config[i];
                u32 n_aps_flag =
                        iwl_mvm_scan_ch_n_aps_flag(vif_type,
-                                                  cfg->v2.channel_num);
+                                                  channels[i]->hw_value);
 
                cfg->flags = cpu_to_le32(flags | n_aps_flag);
                cfg->v2.channel_num = channels[i]->hw_value;