diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-09-26 15:19:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:53:15 -0700 |
| commit | fb1c1cd6c5a8988b14c5c6c0dfe55542df3a34c6 (patch) | |
| tree | 9dec818b2b6aea9c9823902e9c5b0108134d5747 /net/mac80211 | |
| parent | af1a90da397f071d7ee893145a1e7b2124689376 (diff) | |
| download | linux-3.10-fb1c1cd6c5a8988b14c5c6c0dfe55542df3a34c6.tar.gz linux-3.10-fb1c1cd6c5a8988b14c5c6c0dfe55542df3a34c6.tar.bz2 linux-3.10-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')
| -rw-r--r-- | net/mac80211/ieee80211.c | 7 | ||||
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 2 | ||||
| -rw-r--r-- | net/mac80211/ieee80211_iface.c | 3 | ||||
| -rw-r--r-- | net/mac80211/rx.c | 8 |
4 files changed, 19 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 52638194e45..b1180536c33 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) { diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index a5961f16f20..636de70cd85 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -290,7 +290,7 @@ struct ieee80211_if_sta { #define IEEE80211_SDATA_SHORT_PREAMBLE BIT(3) struct ieee80211_sub_if_data { struct list_head list; - unsigned int type; + enum ieee80211_if_types type; struct wireless_dev wdev; diff --git a/net/mac80211/ieee80211_iface.c b/net/mac80211/ieee80211_iface.c index 369ee4f52a2..60cee6e602d 100644 --- a/net/mac80211/ieee80211_iface.c +++ b/net/mac80211/ieee80211_iface.c @@ -243,6 +243,9 @@ void ieee80211_if_reinit(struct net_device *dev) ieee80211_if_sdata_deinit(sdata); switch (sdata->type) { + case IEEE80211_IF_TYPE_MGMT: + /* nothing to do */ + break; case IEEE80211_IF_TYPE_AP: { /* Remove all virtual interfaces that use this BSS * as their sdata->bss */ diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 453ccab060a..34adc5288fb 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1425,6 +1425,7 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, rx->sta = ieee80211_ibss_add_sta(sdata->dev, rx->skb, bssid, hdr->addr2); break; + case IEEE80211_IF_TYPE_VLAN: case IEEE80211_IF_TYPE_AP: if (!bssid) { if (compare_ether_addr(sdata->dev->dev_addr, @@ -1449,6 +1450,13 @@ static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, if (compare_ether_addr(sdata->u.wds.remote_addr, hdr->addr2)) return 0; break; + case IEEE80211_IF_TYPE_MNTR: + /* take everything */ + break; + case IEEE80211_IF_TYPE_MGMT: + /* should never get here */ + WARN_ON(1); + break; } return 1; |