mac80211: flush workqueue before calling driver ->stop() method

Since commit "mwl8k: handle station database update for AP's sta entry
via ->sta_notify()", mwl8k every now and then gets a command timeout
when ifconfig'ing a STA interface down.  This turns out to be due to
mwl8k_stop() being called while the work queue item that was scheduled
by mwl8k_sta_notify() to remove the STA entry for the associated AP is
still queued, and the former disables interrupts so that when the
latter eventually runs, a command completion interrupt is never seen.

Fix this by changing ieee80211_stop_device() so that the workqueue is
flushed before drv_stop() is called, instead of doing it the other way
around as is done now.  (As ->stop() is allowed to sleep, there isn't
any reason for drivers to queue work from within it.)

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 72a98e8447184dda0c999c70073bc1e7b58c3073..a2ba6e29bd9a372cc55815e47b90d48b1b82ffdc 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1069,9 +1069,9 @@ 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);
+       drv_stop(local);
 }
 
 int ieee80211_reconfig(struct ieee80211_local *local)