diff options
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index cc756e93e6c8..cf477ad39dac 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
@@ -535,8 +535,6 @@ static int ieee80211_stop(struct net_device *dev) | |||
535 | local->sta_hw_scanning = 0; | 535 | local->sta_hw_scanning = 0; |
536 | } | 536 | } |
537 | 537 | ||
538 | flush_workqueue(local->hw.workqueue); | ||
539 | |||
540 | sdata->u.sta.flags &= ~IEEE80211_STA_PRIVACY_INVOKED; | 538 | sdata->u.sta.flags &= ~IEEE80211_STA_PRIVACY_INVOKED; |
541 | kfree(sdata->u.sta.extra_ie); | 539 | kfree(sdata->u.sta.extra_ie); |
542 | sdata->u.sta.extra_ie = NULL; | 540 | sdata->u.sta.extra_ie = NULL; |
@@ -560,6 +558,8 @@ static int ieee80211_stop(struct net_device *dev) | |||
560 | 558 | ||
561 | ieee80211_led_radio(local, 0); | 559 | ieee80211_led_radio(local, 0); |
562 | 560 | ||
561 | flush_workqueue(local->hw.workqueue); | ||
562 | |||
563 | tasklet_disable(&local->tx_pending_tasklet); | 563 | tasklet_disable(&local->tx_pending_tasklet); |
564 | tasklet_disable(&local->tasklet); | 564 | tasklet_disable(&local->tasklet); |
565 | } | 565 | } |