diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-08-20 18:02:20 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-28 18:40:25 (GMT) |
commit | 84f6a01ce05fa671f7745b6e041e698a2d1f1341 (patch) | |
tree | 9d27eb23cf2c310b572193cbef290b6b84eb0259 /net/mac80211/util.c | |
parent | 5eb6ba83aa326e2f2cf9109d20df5d6a497b36bb (diff) | |
download | linux-fsl-qoriq-84f6a01ce05fa671f7745b6e041e698a2d1f1341.tar.xz |
mac80211: fix configure_filter invocation after stop
Since configure_filter can sleep now, any multicast
configuration needed to be postponed to a work struct.
This, however, lead to a problem that we could queue
the work, stop the device and then afterwards invoke
configure_filter which may lead to driver hangs and is
a bug. To fix this, we can just cancel the filter work
since it's unnecessary to do after stopping the hw.
Since there are various places that call drv_stop, and
two of them do very similar things, the code for them
can be put into a shared function at the same time.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Reported-by: Lennert Buytenhek <buytenh@wantstofly.org>
Tested-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r-- | net/mac80211/util.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 5eb3063..dd65643 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1007,6 +1007,16 @@ u32 ieee80211_sta_get_rates(struct ieee80211_local *local, return supp_rates; } +void ieee80211_stop_device(struct ieee80211_local *local) +{ + ieee80211_led_radio(local, false); + + cancel_work_sync(&local->reconfig_filter); + drv_stop(local); + + flush_workqueue(local->workqueue); +} + int ieee80211_reconfig(struct ieee80211_local *local) { struct ieee80211_hw *hw = &local->hw; |