summaryrefslogtreecommitdiff
path: root/net/mac80211/iface.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-01 21:41:17 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 15:01:53 -0400
commitab1faead50d09165b58c2854997c7205ca9c0d22 (patch)
tree6eb456e24aab52cdd9ed152d09008635a1ebd555 /net/mac80211/iface.c
parent6dc1cb0319997648f59b0f46b9e093e779f0353d (diff)
downloadlinux-stable-ab1faead50d09165b58c2854997c7205ca9c0d22.tar.gz
linux-stable-ab1faead50d09165b58c2854997c7205ca9c0d22.tar.bz2
linux-stable-ab1faead50d09165b58c2854997c7205ca9c0d22.zip
mac80211: remove dead code, clean up
With mac80211 now always controlled by an external SME, a lot of code is dead -- SSID, BSSID, channel selection is always done externally, etc. Additionally, rename IEEE80211_STA_TKIP_WEP_USED to IEEE80211_STA_DISABLE_11N and clean up the code a bit. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r--net/mac80211/iface.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index b7c8a4484298..b87bf425f857 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -486,8 +486,6 @@ static int ieee80211_stop(struct net_device *dev)
synchronize_rcu();
skb_queue_purge(&sdata->u.mgd.skb_queue);
- sdata->u.mgd.flags &= ~(IEEE80211_STA_PRIVACY_INVOKED |
- IEEE80211_STA_TKIP_WEP_USED);
kfree(sdata->u.mgd.extra_ie);
sdata->u.mgd.extra_ie = NULL;
sdata->u.mgd.extra_ie_len = 0;