Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / net / mac80211 / main.c

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index a06b6ee63c07d7ac64f2440dba3fcf4b8fd40daa..4935b843bcca31ecca7b198da5285a996bc9294f 100644 (file)
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -850,6 +850,12 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
 
        rtnl_unlock();
 
+       /*
+        * Now all work items will be gone, but the
+        * timer might still be armed, so delete it
+        */
+       del_timer_sync(&local->work_timer);
+
        cancel_work_sync(&local->restart_work);
        cancel_work_sync(&local->reconfig_filter);