mac80211: make wake/stop_queue_by_reason() functions static

[safe/jmp/linux-2.6] / net / mac80211 / iface.c

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index b907482..8e0e330 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -383,6 +383,8 @@ static int ieee80211_stop(struct net_device *dev)
                atomic_dec(&local->iff_promiscs);
 
        dev_mc_unsync(local->mdev, dev);
+       del_timer_sync(&local->dynamic_ps_timer);
+       cancel_work_sync(&local->dynamic_ps_enable_work);
 
        /* APs need special treatment */
        if (sdata->vif.type == NL80211_IFTYPE_AP) {
@@ -459,7 +461,8 @@ static int ieee80211_stop(struct net_device *dev)
                synchronize_rcu();
                skb_queue_purge(&sdata->u.sta.skb_queue);
 
-               sdata->u.sta.flags &= ~IEEE80211_STA_PRIVACY_INVOKED;
+               sdata->u.sta.flags &= ~(IEEE80211_STA_PRIVACY_INVOKED |
+                                       IEEE80211_STA_TKIP_WEP_USED);
                kfree(sdata->u.sta.extra_ie);
                sdata->u.sta.extra_ie = NULL;
                sdata->u.sta.extra_ie_len = 0;