diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-06 12:57:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-06 12:57:18 -0700 |
| commit | bfe34ebbaa125f00da309f59cc9d30febe1e3115 (patch) | |
| tree | 505b43fc81be09ec5b42f82a3e64f300a5e838d5 /drivers/net/wireless/rt2x00/rt2x00dev.c | |
| parent | 3d7ddd540b4c2d24c6a3e7a52c083a0c31e6151c (diff) | |
| parent | 6b4f645a491ac29c7dced415d034eea7736155a6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 658a63bfb76..db54fcc94c8 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -215,7 +215,7 @@ void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev) rt2x00lib_beacondone_iter, rt2x00dev); - queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->intf_work); + ieee80211_queue_work(rt2x00dev->hw, &rt2x00dev->intf_work); } EXPORT_SYMBOL_GPL(rt2x00lib_beacondone); @@ -893,6 +893,12 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) rt2x00lib_disable_radio(rt2x00dev); /* + * Stop all work. + */ + cancel_work_sync(&rt2x00dev->filter_work); + cancel_work_sync(&rt2x00dev->intf_work); + + /* * Uninitialize device. */ rt2x00lib_uninitialize(rt2x00dev); |