[PATCH 2.6.36] mac80211: delete work timer

[PATCH 2.6.36] mac80211: delete work timer

[Johannes Berg]

From: Johannes Berg <johannes.berg@intel.com>

The new workqueue changes helped me find this bug
that's been lingering since the changes to the work
processing in mac80211 -- the work timer is never
deleted properly. Do that to avoid having it fire
after all data structures have been freed. It can't
be re-armed because all it will do, if running, is
schedule the work, but that gets flushed later and
won't have anything to do since all work items are
gone by now (by way of interface removal).

Cc: stable@kernel.org [2.6.34+]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
This might clash with Christian's fix? But the fixup should be easy.

 net/mac80211/main.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- wireless-testing.orig/net/mac80211/main.c	2010-08-25 14:36:21.000000000 +0200
+++ wireless-testing/net/mac80211/main.c	2010-08-25 14:41:50.000000000 +0200
@@ -812,6 +812,12 @@ void ieee80211_unregister_hw(struct ieee
 
 	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->reconfig_filter);
 
 	ieee80211_clear_tx_pending(local);