Commit 127ee0d7 authored by Ilan Peer's avatar Ilan Peer Committed by Luca Coelho
Browse files

iwlwifi: scan: Modify return value of a function 



The function iwl_mvm_umac_scan_fill_6g_chan_list() always returns 0.
Change its return value to 'void'.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220204122220.caef72dc255c.I186b787c7f190ca00c2800e1035f2503360f58a8@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent e2d53d10

drivers/net/wireless/intel/iwlwifi/mvm/scan.c

+2 −5
Original line number Diff line number Diff line
@@ -1656,7 +1656,7 @@ iwl_mvm_umac_scan_cfg_channels_v6(struct iwl_mvm *mvm, 
	}

}



static int

static void

iwl_mvm_umac_scan_fill_6g_chan_list(struct iwl_mvm *mvm,

				    struct iwl_mvm_scan_params *params,

				     struct iwl_scan_probe_params_v4 *pp)
@@ -1725,7 +1725,6 @@ iwl_mvm_umac_scan_fill_6g_chan_list(struct iwl_mvm *mvm, 


	pp->short_ssid_num = idex_s;

	pp->bssid_num = idex_b;

	return 0;

}



/* TODO: this function can be merged with iwl_mvm_scan_umac_fill_ch_p_v6 */
@@ -2414,9 +2413,7 @@ static int iwl_mvm_scan_umac_v14_and_above(struct iwl_mvm *mvm, 
	cp->n_aps_override[0] = IWL_SCAN_ADWELL_N_APS_GO_FRIENDLY;

	cp->n_aps_override[1] = IWL_SCAN_ADWELL_N_APS_SOCIAL_CHS;



	ret = iwl_mvm_umac_scan_fill_6g_chan_list(mvm, params, pb);

	if (ret)

		return ret;

	iwl_mvm_umac_scan_fill_6g_chan_list(mvm, params, pb);



	iwl_mvm_umac_scan_cfg_channels_v6_6g(params,

					     params->n_channels,