aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-09-26 15:19:43 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:53:15 -0700
commitfb1c1cd6c5a8988b14c5c6c0dfe55542df3a34c6 (patch)
tree9dec818b2b6aea9c9823902e9c5b0108134d5747 /net/mac80211/ieee80211.c
parent[PATCH] mac80211: remove ieee80211_wep_get_keyidx (diff)
downloadlinux-dev-fb1c1cd6c5a8988b14c5c6c0dfe55542df3a34c6.tar.xz
linux-dev-fb1c1cd6c5a8988b14c5c6c0dfe55542df3a34c6.zip
[PATCH] mac80211: fix vlan bug
VLAN interfaces have yet another bug: they aren't accounted for properly in the receive path in prepare_for_handlers(). I noticed this by code inspection, but it would be easy for the compiler to catch such things if we'd just use the proper enum where appropriate. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211.c')
-rw-r--r--net/mac80211/ieee80211.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 52638194e45f..b1180536c335 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -344,6 +344,13 @@ static int ieee80211_open(struct net_device *dev)
if (!sdata->u.vlan.ap)
return -ENOLINK;
break;
+ case IEEE80211_IF_TYPE_AP:
+ case IEEE80211_IF_TYPE_MGMT:
+ case IEEE80211_IF_TYPE_STA:
+ case IEEE80211_IF_TYPE_MNTR:
+ case IEEE80211_IF_TYPE_IBSS:
+ /* no special treatment */
+ break;
}
if (local->open_count == 0) {