Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2fa2462 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlagn: move iwl_process_scan_complete up 



To make the next patch easier to read, move
the function up, it'll be needed earlier in
this file in the next patch.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f253247a

drivers/net/wireless/iwlwifi/iwl-scan.c

+54 −54
Original line number Diff line number Diff line
@@ -114,6 +114,60 @@ static void iwl_complete_scan(struct iwl_priv *priv, bool aborted) 
	priv->scan_request = NULL;

}



static void iwl_process_scan_complete(struct iwl_priv *priv)

{

	bool aborted;



	IWL_DEBUG_SCAN(priv, "Completed scan.\n");



	cancel_delayed_work(&priv->scan_check);



	aborted = test_and_clear_bit(STATUS_SCAN_ABORTING, &priv->shrd->status);

	if (aborted)

		IWL_DEBUG_SCAN(priv, "Aborted scan completed.\n");



	if (!test_and_clear_bit(STATUS_SCANNING, &priv->shrd->status)) {

		IWL_DEBUG_SCAN(priv, "Scan already completed.\n");

		goto out_settings;

	}



	if (priv->scan_type == IWL_SCAN_ROC) {

		ieee80211_remain_on_channel_expired(priv->hw);

		priv->hw_roc_channel = NULL;

		schedule_delayed_work(&priv->hw_roc_disable_work, 10 * HZ);

	}



	if (priv->scan_type != IWL_SCAN_NORMAL && !aborted) {

		int err;



		/* Check if mac80211 requested scan during our internal scan */

		if (priv->scan_request == NULL)

			goto out_complete;



		/* If so request a new scan */

		err = iwl_scan_initiate(priv, priv->scan_vif, IWL_SCAN_NORMAL,

					priv->scan_request->channels[0]->band);

		if (err) {

			IWL_DEBUG_SCAN(priv,

				"failed to initiate pending scan: %d\n", err);

			aborted = true;

			goto out_complete;

		}



		return;

	}



out_complete:

	iwl_complete_scan(priv, aborted);



out_settings:

	/* Can we still talk to firmware ? */

	if (!iwl_is_ready_rf(priv->shrd))

		return;



	iwlagn_post_scan(priv);

}



void iwl_force_scan_end(struct iwl_priv *priv)

{

	lockdep_assert_held(&priv->shrd->mutex);
@@ -1013,60 +1067,6 @@ static void iwl_bg_abort_scan(struct work_struct *work) 
	mutex_unlock(&priv->shrd->mutex);

}



static void iwl_process_scan_complete(struct iwl_priv *priv)

{

	bool aborted;



	IWL_DEBUG_SCAN(priv, "Completed scan.\n");



	cancel_delayed_work(&priv->scan_check);



	aborted = test_and_clear_bit(STATUS_SCAN_ABORTING, &priv->shrd->status);

	if (aborted)

		IWL_DEBUG_SCAN(priv, "Aborted scan completed.\n");



	if (!test_and_clear_bit(STATUS_SCANNING, &priv->shrd->status)) {

		IWL_DEBUG_SCAN(priv, "Scan already completed.\n");

		goto out_settings;

	}



	if (priv->scan_type == IWL_SCAN_ROC) {

		ieee80211_remain_on_channel_expired(priv->hw);

		priv->hw_roc_channel = NULL;

		schedule_delayed_work(&priv->hw_roc_disable_work, 10 * HZ);

	}



	if (priv->scan_type != IWL_SCAN_NORMAL && !aborted) {

		int err;



		/* Check if mac80211 requested scan during our internal scan */

		if (priv->scan_request == NULL)

			goto out_complete;



		/* If so request a new scan */

		err = iwl_scan_initiate(priv, priv->scan_vif, IWL_SCAN_NORMAL,

					priv->scan_request->channels[0]->band);

		if (err) {

			IWL_DEBUG_SCAN(priv,

				"failed to initiate pending scan: %d\n", err);

			aborted = true;

			goto out_complete;

		}



		return;

	}



out_complete:

	iwl_complete_scan(priv, aborted);



out_settings:

	/* Can we still talk to firmware ? */

	if (!iwl_is_ready_rf(priv->shrd))

		return;



	iwlagn_post_scan(priv);

}



static void iwl_bg_scan_completed(struct work_struct *work)

{

	struct iwl_priv *priv =