diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-21 04:14:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-21 04:14:25 -0400 |
| commit | 87eb367003887cdc81a5d183efea227b5b488961 (patch) | |
| tree | 40f617e25a9364d573e3cd2189c9e7fa56c8a0fe /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | ccb7c7732e2ceb4e81a7806faf1670be9681ccd2 (diff) | |
| parent | 05d17608a69b3ae653ea5c9857283bef3439c733 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-6000.c
net/core/dev.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 0b497d4bc659..310bc6aeb99b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -3305,6 +3305,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv) | |||
| 3305 | 3305 | ||
| 3306 | cancel_delayed_work_sync(&priv->init_alive_start); | 3306 | cancel_delayed_work_sync(&priv->init_alive_start); |
| 3307 | cancel_delayed_work(&priv->scan_check); | 3307 | cancel_delayed_work(&priv->scan_check); |
| 3308 | cancel_work_sync(&priv->start_internal_scan); | ||
| 3308 | cancel_delayed_work(&priv->alive_start); | 3309 | cancel_delayed_work(&priv->alive_start); |
| 3309 | cancel_work_sync(&priv->beacon_update); | 3310 | cancel_work_sync(&priv->beacon_update); |
| 3310 | del_timer_sync(&priv->statistics_periodic); | 3311 | del_timer_sync(&priv->statistics_periodic); |