X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fmac80211%2Fmain.c;h=df0836ff1a206c4cfaf25d5ba602ed5496a95b89;hb=dc7c65db2845a8d17432d89252c4227a9a7cb15f;hp=98c0b5e56ecc02e50a754dd0b77303dac9b6160c;hpb=1b3cba8e60c67c968d108ac55c77e32c1928dec3;p=linux-2.6

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 98c0b5e56e..df0836ff1a 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -530,8 +530,6 @@ static int ieee80211_stop(struct net_device *dev)
 				local->sta_hw_scanning = 0;
 		}
 
-		flush_workqueue(local->hw.workqueue);
-
 		sdata->u.sta.flags &= ~IEEE80211_STA_PRIVACY_INVOKED;
 		kfree(sdata->u.sta.extra_ie);
 		sdata->u.sta.extra_ie = NULL;
@@ -555,6 +553,8 @@ static int ieee80211_stop(struct net_device *dev)
 
 		ieee80211_led_radio(local, 0);
 
+		flush_workqueue(local->hw.workqueue);
+
 		tasklet_disable(&local->tx_pending_tasklet);
 		tasklet_disable(&local->tasklet);
 	}