diff options
author | David S. Miller <davem@davemloft.net> | 2009-11-18 10:55:32 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-18 10:55:32 -0800 |
commit | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (patch) | |
tree | eab385cabe589346bcf19385c997ab8dabaef7bd /net/wireless/util.c | |
parent | drivers/net/wireless/rtl818x: remove exceptional & on function name (diff) | |
parent | znet: fix build failure from i82593.h relocation (diff) | |
download | linux-dev-dfef948ed2ba69cf041840b5e860d6b4e16fa0b1.tar.xz linux-dev-dfef948ed2ba69cf041840b5e860d6b4e16fa0b1.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/util.c')
-rw-r--r-- | net/wireless/util.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 3fc2df86278f..5aa39f7cf9b9 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -320,7 +320,9 @@ int ieee80211_data_to_8023(struct sk_buff *skb, u8 *addr, break; case cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS): if (unlikely(iftype != NL80211_IFTYPE_WDS && - iftype != NL80211_IFTYPE_MESH_POINT)) + iftype != NL80211_IFTYPE_MESH_POINT && + iftype != NL80211_IFTYPE_AP_VLAN && + iftype != NL80211_IFTYPE_STATION)) return -1; if (iftype == NL80211_IFTYPE_MESH_POINT) { struct ieee80211s_hdr *meshdr = |