aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-07-10 23:53:32 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-07-14 14:52:58 -0400
commit65fdbb48eb43e33e94239677a75422ddc6f5eb75 (patch)
tree4299928a4500daf581f58615b7e6fab19f70b82b /drivers/net/wireless
parenta326a5d096f031af46c0073dd78eb80dea1f311a (diff)
iwlwifi: remove post associate work
This patch removes post associate work. It wasn't used. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h1
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c18
2 files changed, 0 insertions, 19 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 0177a1deabd2..81a57cb2266b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1065,7 +1065,6 @@ struct iwl_priv {
1065 struct delayed_work init_alive_start; 1065 struct delayed_work init_alive_start;
1066 struct delayed_work alive_start; 1066 struct delayed_work alive_start;
1067 struct delayed_work scan_check; 1067 struct delayed_work scan_check;
1068 struct delayed_work post_associate;
1069 /* TX Power */ 1068 /* TX Power */
1070 s8 tx_power_user_lmt; 1069 s8 tx_power_user_lmt;
1071 s8 tx_power_channel_lmt; 1070 s8 tx_power_channel_lmt;
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 516508f5fd49..fbb854e31bdb 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -2520,18 +2520,6 @@ static void iwl4965_post_associate(struct iwl_priv *priv)
2520 priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN; 2520 priv->next_scan_jiffies = jiffies + IWL_DELAY_NEXT_SCAN;
2521} 2521}
2522 2522
2523
2524static void iwl4965_bg_post_associate(struct work_struct *data)
2525{
2526 struct iwl_priv *priv = container_of(data, struct iwl_priv,
2527 post_associate.work);
2528
2529 mutex_lock(&priv->mutex);
2530 iwl4965_post_associate(priv);
2531 mutex_unlock(&priv->mutex);
2532
2533}
2534
2535static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf); 2523static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf);
2536 2524
2537static void iwl_bg_scan_completed(struct work_struct *work) 2525static void iwl_bg_scan_completed(struct work_struct *work)
@@ -2662,7 +2650,6 @@ static void iwl4965_mac_stop(struct ieee80211_hw *hw)
2662 */ 2650 */
2663 mutex_lock(&priv->mutex); 2651 mutex_lock(&priv->mutex);
2664 iwl_scan_cancel_timeout(priv, 100); 2652 iwl_scan_cancel_timeout(priv, 100);
2665 cancel_delayed_work(&priv->post_associate);
2666 mutex_unlock(&priv->mutex); 2653 mutex_unlock(&priv->mutex);
2667 } 2654 }
2668 2655
@@ -3064,7 +3051,6 @@ static void iwl4965_mac_remove_interface(struct ieee80211_hw *hw,
3064 3051
3065 if (iwl_is_ready_rf(priv)) { 3052 if (iwl_is_ready_rf(priv)) {
3066 iwl_scan_cancel_timeout(priv, 100); 3053 iwl_scan_cancel_timeout(priv, 100);
3067 cancel_delayed_work(&priv->post_associate);
3068 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK; 3054 priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
3069 iwl4965_commit_rxon(priv); 3055 iwl4965_commit_rxon(priv);
3070 } 3056 }
@@ -3429,8 +3415,6 @@ static void iwl4965_mac_reset_tsf(struct ieee80211_hw *hw)
3429 3415
3430 iwl_reset_qos(priv); 3416 iwl_reset_qos(priv);
3431 3417
3432 cancel_delayed_work(&priv->post_associate);
3433
3434 spin_lock_irqsave(&priv->lock, flags); 3418 spin_lock_irqsave(&priv->lock, flags);
3435 priv->assoc_id = 0; 3419 priv->assoc_id = 0;
3436 priv->assoc_capability = 0; 3420 priv->assoc_capability = 0;
@@ -4032,7 +4016,6 @@ static void iwl_setup_deferred_work(struct iwl_priv *priv)
4032 INIT_WORK(&priv->beacon_update, iwl4965_bg_beacon_update); 4016 INIT_WORK(&priv->beacon_update, iwl4965_bg_beacon_update);
4033 INIT_WORK(&priv->set_monitor, iwl4965_bg_set_monitor); 4017 INIT_WORK(&priv->set_monitor, iwl4965_bg_set_monitor);
4034 INIT_WORK(&priv->run_time_calib_work, iwl_bg_run_time_calib_work); 4018 INIT_WORK(&priv->run_time_calib_work, iwl_bg_run_time_calib_work);
4035 INIT_DELAYED_WORK(&priv->post_associate, iwl4965_bg_post_associate);
4036 INIT_DELAYED_WORK(&priv->init_alive_start, iwl_bg_init_alive_start); 4019 INIT_DELAYED_WORK(&priv->init_alive_start, iwl_bg_init_alive_start);
4037 INIT_DELAYED_WORK(&priv->alive_start, iwl_bg_alive_start); 4020 INIT_DELAYED_WORK(&priv->alive_start, iwl_bg_alive_start);
4038 4021
@@ -4059,7 +4042,6 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv)
4059 cancel_delayed_work_sync(&priv->init_alive_start); 4042 cancel_delayed_work_sync(&priv->init_alive_start);
4060 cancel_delayed_work(&priv->scan_check); 4043 cancel_delayed_work(&priv->scan_check);
4061 cancel_delayed_work(&priv->alive_start); 4044 cancel_delayed_work(&priv->alive_start);
4062 cancel_delayed_work(&priv->post_associate);
4063 cancel_work_sync(&priv->beacon_update); 4045 cancel_work_sync(&priv->beacon_update);
4064 del_timer_sync(&priv->statistics_periodic); 4046 del_timer_sync(&priv->statistics_periodic);
4065} 4047}