]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
mac80211: cancel restart_work in ieee80211_unregister_hw
authorChristian Lamparter <chunkeey@googlemail.com>
Sun, 22 Aug 2010 21:48:25 +0000 (23:48 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 25 Aug 2010 18:33:20 +0000 (14:33 -0400)
Unlike most other workqueue-tasks, the restart_work is
not scheduled onto mac80211's private per-interface
workqueue, but onto one of the system-wide workqueues.

Therefore the mac80211-stack has to cancel any pending
restarts, before destroying the shared device context
and handing back the memory. Otherwise - under very
unlucky circumstances - there could be a stale work-
item left, because some other kernel component might
have delayed the execution of ieee80211_restart_work
for too long.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/main.c

index 5756fba63d48fd552e9cd47f04088b30349214c5..28415de5f4767d45a34c173d1e34aa13c33bd4bd 100644 (file)
@@ -807,6 +807,7 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
 
        rtnl_unlock();
 
+       cancel_work_sync(&local->restart_work);
        cancel_work_sync(&local->reconfig_filter);
 
        ieee80211_clear_tx_pending(local);