diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-09-24 21:52:34 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-24 21:52:34 +0200 |
| commit | 29ad2facd47f8e37eab8b156e2c384fa181c8b4a (patch) | |
| tree | 25d4df186cd631810ff15a8e7d37cb6cdd806cdb /net/mac80211/main.c | |
| parent | ath9k: make the driver specific rate control module optional (diff) | |
| parent | mac80211: fix use-after-free (diff) | |
| download | linux-29ad2facd47f8e37eab8b156e2c384fa181c8b4a.tar.xz linux-29ad2facd47f8e37eab8b156e2c384fa181c8b4a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath5k/base.c
net/mac80211/main.c
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 18fdeca43d98..7c8542627351 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -868,6 +868,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); |