diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-07-27 11:56:23 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-08-04 16:43:19 -0400 |
| commit | ebc8ab17d69cbaec6bb345a48a2cb87047643f63 (patch) | |
| tree | 11c1b3707d5adc6421c053d0f1b6ef769ed44c17 /drivers/net/wireless/at76c50x-usb.c | |
| parent | c94dbff7996b861fb0ff730bdf6eac4e2b288402 (diff) | |
| download | kernel_samsung_aries-ebc8ab17d69cbaec6bb345a48a2cb87047643f63.zip kernel_samsung_aries-ebc8ab17d69cbaec6bb345a48a2cb87047643f63.tar.gz kernel_samsung_aries-ebc8ab17d69cbaec6bb345a48a2cb87047643f63.tar.bz2 | |
ar76c50x-usb: cancel promisc work during mac80211 stop
We weren't ever cancelling this.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Acked-by: Kalle Valo <kalle.valo@iki.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.c')
| -rw-r--r-- | drivers/net/wireless/at76c50x-usb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index 13303fa..bbf5277 100644 --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c @@ -1773,6 +1773,8 @@ static void at76_mac80211_stop(struct ieee80211_hw *hw) at76_dbg(DBG_MAC80211, "%s()", __func__); + cancel_work_sync(&priv->work_set_promisc); + mutex_lock(&priv->mtx); if (!priv->device_unplugged) { |