Commit 071249b1 authored Aug 25, 2010 by Johannes Berg Committed by John W. Linville Aug 30, 2010

mac80211: delete work timer



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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent f880c205

net/mac80211/main.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -732,6 +732,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);

Admin message