From: Johannes Berg Date: Wed, 25 Aug 2010 12:47:38 +0000 (+0200) Subject: mac80211: delete work timer X-Git-Tag: v2.6.35.5~98 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58b29725e5bd74da734c6f3fd1eac934a8fed73e;p=thirdparty%2Fkernel%2Fstable.git mac80211: delete work timer commit 071249b1d501b1f31a6b1af3fbcbe03158a84e5c upstream. 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). Signed-off-by: Johannes Berg Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 22a384dfab65d..52f15fe6f0ed2 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -659,6 +659,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->reconfig_filter); ieee80211_clear_tx_pending(local);