From 24ee6e2c4f13a86a162205163b6a55906cdbb658 Mon Sep 17 00:00:00 2001 From: Ivo van Doorn Date: Thu, 3 Jul 2008 19:02:44 +0200 Subject: [PATCH] --- yaml --- r: 98819 b: refs/heads/master c: ea0c925370b33baf168bb33782c613468c1aa119 h: refs/heads/master i: 98817: cc98b6809393dc6ebd688a4b015eece0530370e4 98815: e5ca9c2bfc780becf3f3f16590e52105bd0525e5 v: v3 --- [refs] | 2 +- trunk/net/mac80211/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 435c5f8bf48a..4b38bc5ef62c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8db9369ff92b1cd93566baadd8bd2992f025fdd0 +refs/heads/master: ea0c925370b33baf168bb33782c613468c1aa119 diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c index 98c0b5e56ecc..df0836ff1a20 100644 --- a/trunk/net/mac80211/main.c +++ b/trunk/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); }