Commit 6e56f01d authored by Luciano Coelho's avatar Luciano Coelho Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: rename some LMAC-specific scan functions 



Some LMAC specific functions had too generic names
(i.e. *_scan_offload_*) and were hard to distinguish from functions
that are really generic.  Rename these functions to *_lmac_scan_* in
to make it more consistent and easier to read.

Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent dfbf156d

drivers/net/wireless/iwlwifi/mvm/mvm.h

+9 −9
Original line number Diff line number Diff line
@@ -1127,10 +1127,10 @@ int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm); 
void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm);



/* Scheduled scan */

int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,

int iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm,

					struct iwl_rx_cmd_buffer *rxb,

					struct iwl_device_cmd *cmd);

int iwl_mvm_rx_scan_offload_iter_complete_notif(struct iwl_mvm *mvm,

int iwl_mvm_rx_lmac_scan_iter_complete_notif(struct iwl_mvm *mvm,

					     struct iwl_rx_cmd_buffer *rxb,

					     struct iwl_device_cmd *cmd);

int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
@@ -1139,7 +1139,7 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm, 
			     struct ieee80211_scan_ies *ies,

			     int type);

int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm, bool notify);

int iwl_mvm_rx_scan_offload_results(struct iwl_mvm *mvm,

int iwl_mvm_rx_scan_match_found(struct iwl_mvm *mvm,

				struct iwl_rx_cmd_buffer *rxb,

				struct iwl_device_cmd *cmd);

drivers/net/wireless/iwlwifi/mvm/ops.c

+3 −3
Original line number Diff line number Diff line
@@ -238,10 +238,10 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = { 
	RX_HANDLER(EOSP_NOTIFICATION, iwl_mvm_rx_eosp_notif, false),



	RX_HANDLER(SCAN_ITERATION_COMPLETE,

		   iwl_mvm_rx_scan_offload_iter_complete_notif, false),

		   iwl_mvm_rx_lmac_scan_iter_complete_notif, false),

	RX_HANDLER(SCAN_OFFLOAD_COMPLETE,

		   iwl_mvm_rx_scan_offload_complete_notif, true),

	RX_HANDLER(MATCH_FOUND_NOTIFICATION, iwl_mvm_rx_scan_offload_results,

		   iwl_mvm_rx_lmac_scan_complete_notif, true),

	RX_HANDLER(MATCH_FOUND_NOTIFICATION, iwl_mvm_rx_scan_match_found,

		   false),

	RX_HANDLER(SCAN_COMPLETE_UMAC, iwl_mvm_rx_umac_scan_complete_notif,

		   true),

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

+11 −11
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static u8 *iwl_mvm_dump_channel_list(struct iwl_scan_results_notif *res, 
	return buf;

}



int iwl_mvm_rx_scan_offload_iter_complete_notif(struct iwl_mvm *mvm,

int iwl_mvm_rx_lmac_scan_iter_complete_notif(struct iwl_mvm *mvm,

					     struct iwl_rx_cmd_buffer *rxb,

					     struct iwl_device_cmd *cmd)

{
@@ -342,7 +342,7 @@ int iwl_mvm_rx_scan_offload_iter_complete_notif(struct iwl_mvm *mvm, 
	return 0;

}



int iwl_mvm_rx_scan_offload_results(struct iwl_mvm *mvm,

int iwl_mvm_rx_scan_match_found(struct iwl_mvm *mvm,

				struct iwl_rx_cmd_buffer *rxb,

				struct iwl_device_cmd *cmd)

{
@@ -352,7 +352,7 @@ int iwl_mvm_rx_scan_offload_results(struct iwl_mvm *mvm, 
	return 0;

}



int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,

int iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm,

					struct iwl_rx_cmd_buffer *rxb,

					struct iwl_device_cmd *cmd)

{
@@ -557,7 +557,7 @@ static bool iwl_mvm_scan_pass_all(struct iwl_mvm *mvm, 
	return true;

}



static int iwl_mvm_send_scan_offload_abort(struct iwl_mvm *mvm)

static int iwl_mvm_send_lmac_scan_abort(struct iwl_mvm *mvm)

{

	int ret;

	struct iwl_host_cmd cmd = {
@@ -598,7 +598,7 @@ static int iwl_mvm_lmac_scan_stop(struct iwl_mvm *mvm, int type) 
				   ARRAY_SIZE(scan_done_notif),

				   NULL, NULL);



	ret = iwl_mvm_send_scan_offload_abort(mvm);

	ret = iwl_mvm_send_lmac_scan_abort(mvm);

	if (ret) {

		IWL_DEBUG_SCAN(mvm, "Send stop %sscan failed %d\n",

			       sched ? "offloaded " : "", ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE