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

Commit ba4c5319 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: move hw_scan into _mac80211 file 



iwlagn_mac_hw_scan should belong to _mac80211 callback.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0b7a4c78

drivers/net/wireless/iwlwifi/iwl-core.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -312,9 +312,6 @@ void iwl_init_scan_params(struct iwl_priv *priv); 
int iwl_scan_cancel(struct iwl_priv *priv);

int iwl_scan_cancel(struct iwl_priv *priv);

void iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);

void iwl_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms);

void iwl_force_scan_end(struct iwl_priv *priv);

void iwl_force_scan_end(struct iwl_priv *priv);

int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,

		    struct ieee80211_vif *vif,

		    struct cfg80211_scan_request *req);

void iwl_internal_short_hw_scan(struct iwl_priv *priv);

void iwl_internal_short_hw_scan(struct iwl_priv *priv);

int iwl_force_reset(struct iwl_priv *priv, int mode, bool external);

int iwl_force_reset(struct iwl_priv *priv, int mode, bool external);

u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame,

u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame,

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

+46 −0
Original line number Original line Diff line number Diff line
@@ -1801,6 +1801,52 @@ static int iwlagn_mac_change_interface(struct ieee80211_hw *hw, 
	return err;

	return err;

}

}





static int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,

		    struct ieee80211_vif *vif,

		    struct cfg80211_scan_request *req)

{

	struct iwl_priv *priv = hw->priv;

	int ret;



	IWL_DEBUG_MAC80211(priv, "enter\n");



	if (req->n_channels == 0)

		return -EINVAL;



	mutex_lock(&priv->shrd->mutex);



	/*

	 * If an internal scan is in progress, just set

	 * up the scan_request as per above.

	 */

	if (priv->scan_type != IWL_SCAN_NORMAL) {

		IWL_DEBUG_SCAN(priv,

			       "SCAN request during internal scan - defer\n");

		priv->scan_request = req;

		priv->scan_vif = vif;

		ret = 0;

	} else {

		priv->scan_request = req;

		priv->scan_vif = vif;

		/*

		 * mac80211 will only ask for one band at a time

		 * so using channels[0] here is ok

		 */

		ret = iwl_scan_initiate(priv, vif, IWL_SCAN_NORMAL,

					req->channels[0]->band);

		if (ret) {

			priv->scan_request = NULL;

			priv->scan_vif = NULL;

		}

	}



	IWL_DEBUG_MAC80211(priv, "leave\n");



	mutex_unlock(&priv->shrd->mutex);



	return ret;

}



struct ieee80211_ops iwlagn_hw_ops = {

struct ieee80211_ops iwlagn_hw_ops = {

	.tx = iwlagn_mac_tx,

	.tx = iwlagn_mac_tx,

	.start = iwlagn_mac_start,

	.start = iwlagn_mac_start,

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

+0 −45
Original line number Original line Diff line number Diff line
@@ -939,51 +939,6 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv, 
	return 0;

	return 0;

}

}





int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,

		    struct ieee80211_vif *vif,

		    struct cfg80211_scan_request *req)

{

	struct iwl_priv *priv = hw->priv;

	int ret;



	IWL_DEBUG_MAC80211(priv, "enter\n");



	if (req->n_channels == 0)

		return -EINVAL;



	mutex_lock(&priv->shrd->mutex);



	/*

	 * If an internal scan is in progress, just set

	 * up the scan_request as per above.

	 */

	if (priv->scan_type != IWL_SCAN_NORMAL) {

		IWL_DEBUG_SCAN(priv,

			       "SCAN request during internal scan - defer\n");

		priv->scan_request = req;

		priv->scan_vif = vif;

		ret = 0;

	} else {

		priv->scan_request = req;

		priv->scan_vif = vif;

		/*

		 * mac80211 will only ask for one band at a time

		 * so using channels[0] here is ok

		 */

		ret = iwl_scan_initiate(priv, vif, IWL_SCAN_NORMAL,

					req->channels[0]->band);

		if (ret) {

			priv->scan_request = NULL;

			priv->scan_vif = NULL;

		}

	}



	IWL_DEBUG_MAC80211(priv, "leave\n");



	mutex_unlock(&priv->shrd->mutex);



	return ret;

}





/*

/*

 * internal short scan, this function should only been called while associated.

 * internal short scan, this function should only been called while associated.