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

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

iwlwifi: remove post associate work 



This patch removes post associate work. It wasn't used.

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 a326a5d0

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

+0 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,6 @@ struct iwl_priv { 
	struct delayed_work init_alive_start;

	struct delayed_work alive_start;

	struct delayed_work scan_check;

	struct delayed_work post_associate;

	/* TX Power */

	s8 tx_power_user_lmt;

	s8 tx_power_channel_lmt;

drivers/net/wireless/iwlwifi/iwl4965-base.c

+0 −18
Original line number Diff line number Diff line
@@ -2520,18 +2520,6 @@ static void iwl4965_post_associate(struct iwl_priv *priv) 
	priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN;

}





static void iwl4965_bg_post_associate(struct work_struct *data)

{

	struct iwl_priv *priv = container_of(data, struct iwl_priv,

					     post_associate.work);



	mutex_lock(&priv->mutex);

	iwl4965_post_associate(priv);

	mutex_unlock(&priv->mutex);



}



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



static void iwl_bg_scan_completed(struct work_struct *work)
@@ -2662,7 +2650,6 @@ static void iwl4965_mac_stop(struct ieee80211_hw *hw) 
		 */

		mutex_lock(&priv->mutex);

		iwl_scan_cancel_timeout(priv, 100);

		cancel_delayed_work(&priv->post_associate);

		mutex_unlock(&priv->mutex);

	}
@@ -3064,7 +3051,6 @@ static void iwl4965_mac_remove_interface(struct ieee80211_hw *hw, 


	if (iwl_is_ready_rf(priv)) {

		iwl_scan_cancel_timeout(priv, 100);

		cancel_delayed_work(&priv->post_associate);

		priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;

		iwl4965_commit_rxon(priv);

	}
@@ -3429,8 +3415,6 @@ static void iwl4965_mac_reset_tsf(struct ieee80211_hw *hw) 


	iwl_reset_qos(priv);



	cancel_delayed_work(&priv->post_associate);



	spin_lock_irqsave(&priv->lock, flags);

	priv->assoc_id = 0;

	priv->assoc_capability = 0;
@@ -4032,7 +4016,6 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv) 
	INIT_WORK(&priv->beacon_update, iwl4965_bg_beacon_update);

	INIT_WORK(&priv->set_monitor, iwl4965_bg_set_monitor);

	INIT_WORK(&priv->run_time_calib_work, iwl_bg_run_time_calib_work);

	INIT_DELAYED_WORK(&priv->post_associate, iwl4965_bg_post_associate);

	INIT_DELAYED_WORK(&priv->init_alive_start, iwl_bg_init_alive_start);

	INIT_DELAYED_WORK(&priv->alive_start, iwl_bg_alive_start);
@@ -4059,7 +4042,6 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv) 
	cancel_delayed_work_sync(&priv->init_alive_start);

	cancel_delayed_work(&priv->scan_check);

	cancel_delayed_work(&priv->alive_start);

	cancel_delayed_work(&priv->post_associate);

	cancel_work_sync(&priv->beacon_update);

	del_timer_sync(&priv->statistics_periodic);

}