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

Commit eedda367 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: remove STATUS_CONF_PENDING in scanning 



This patch removes STATUS_CONF_PENDING usage that called from
iwl4965_mac_config internally after scan completed.

It's called anyway from the mac80211 ieee80211_scan_completed():

	if (local->hw_scanning) {
		local->hw_scanning = false;
		if (ieee80211_hw_config(local))
		...
	}

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5118303f

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

+0 −28
Original line number Diff line number Diff line
@@ -2569,30 +2569,6 @@ static void iwl4965_post_associate(struct iwl_priv *priv) 


}



static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf);



static void iwl_bg_scan_completed(struct work_struct *work)

{

	struct iwl_priv *priv =

	    container_of(work, struct iwl_priv, scan_completed);



	IWL_DEBUG_SCAN("SCAN complete scan\n");



	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

		return;



	if (test_bit(STATUS_CONF_PENDING, &priv->status))

		iwl4965_mac_config(priv->hw, ieee80211_get_hw_conf(priv->hw));



	ieee80211_scan_completed(priv->hw);



	/* Since setting the TXPOWER may have been deferred while

	 * performing the scan, fire one off */

	mutex_lock(&priv->mutex);

	iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);

	mutex_unlock(&priv->mutex);

}



/*****************************************************************************

 *

 * mac80211 entry point functions
@@ -2812,7 +2788,6 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co 
	if (unlikely(!priv->cfg->mod_params->disable_hw_scan &&

		     test_bit(STATUS_SCANNING, &priv->status))) {

		IWL_DEBUG_MAC80211("leave - scanning\n");

		set_bit(STATUS_CONF_PENDING, &priv->status);

		mutex_unlock(&priv->mutex);

		return 0;

	}
@@ -2898,7 +2873,6 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co 
	IWL_DEBUG_MAC80211("leave\n");



out:

	clear_bit(STATUS_CONF_PENDING, &priv->status);

	mutex_unlock(&priv->mutex);

	return ret;

}
@@ -4117,8 +4091,6 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv) 
	INIT_DELAYED_WORK(&priv->init_alive_start, iwl_bg_init_alive_start);

	INIT_DELAYED_WORK(&priv->alive_start, iwl_bg_alive_start);



	/* FIXME : remove when resolved PENDING */

	INIT_WORK(&priv->scan_completed, iwl_bg_scan_completed);

	iwl_setup_scan_deferred_work(priv);

	iwl_setup_power_deferred_work(priv);

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

+1 −2
Original line number Diff line number Diff line
@@ -333,8 +333,7 @@ void iwl_dump_nic_event_log(struct iwl_priv *priv); 
#define STATUS_SCAN_HW		15

#define STATUS_POWER_PMI	16

#define STATUS_FW_ERROR		17

#define STATUS_CONF_PENDING	18

#define STATUS_MODE_PENDING	19

#define STATUS_MODE_PENDING	18





static inline int iwl_is_ready(struct iwl_priv *priv)

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

+21 −2
Original line number Diff line number Diff line
@@ -916,10 +916,29 @@ static void iwl_bg_abort_scan(struct work_struct *work) 
	mutex_unlock(&priv->mutex);

}



static void iwl_bg_scan_completed(struct work_struct *work)

{

	struct iwl_priv *priv =

	    container_of(work, struct iwl_priv, scan_completed);



	IWL_DEBUG_SCAN("SCAN complete scan\n");



	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

		return;



	ieee80211_scan_completed(priv->hw);



	/* Since setting the TXPOWER may have been deferred while

	 * performing the scan, fire one off */

	mutex_lock(&priv->mutex);

	iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);

	mutex_unlock(&priv->mutex);

}





void iwl_setup_scan_deferred_work(struct iwl_priv *priv)

{

	/*  FIXME: move here when resolved PENDING

	 *  INIT_WORK(&priv->scan_completed, iwl_bg_scan_completed); */

	INIT_WORK(&priv->scan_completed, iwl_bg_scan_completed);

	INIT_WORK(&priv->request_scan, iwl_bg_request_scan);

	INIT_WORK(&priv->abort_scan, iwl_bg_abort_scan);

	INIT_DELAYED_WORK(&priv->scan_check, iwl_bg_scan_check);