aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/560-4addr_vlan_check.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-01-12 03:10:03 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-01-12 03:10:03 +0000
commit1d109f9eb2c0c22e0b9781660b248ef3c3d13d75 (patch)
tree3df6a9ffc1b87127ef22106a049efb8f6fe8553a /package/mac80211/patches/560-4addr_vlan_check.patch
parenta0a6ab81816e0f2e47a608f3a0b692780fd5197c (diff)
downloadupstream-1d109f9eb2c0c22e0b9781660b248ef3c3d13d75.tar.gz
upstream-1d109f9eb2c0c22e0b9781660b248ef3c3d13d75.tar.bz2
upstream-1d109f9eb2c0c22e0b9781660b248ef3c3d13d75.zip
mac80211: upgrade to a new unofficial snapshot based on wireless-testing+wireless-2.6
SVN-Revision: 19110
Diffstat (limited to 'package/mac80211/patches/560-4addr_vlan_check.patch')
-rw-r--r--package/mac80211/patches/560-4addr_vlan_check.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/package/mac80211/patches/560-4addr_vlan_check.patch b/package/mac80211/patches/560-4addr_vlan_check.patch
new file mode 100644
index 0000000000..7079957ee6
--- /dev/null
+++ b/package/mac80211/patches/560-4addr_vlan_check.patch
@@ -0,0 +1,15 @@
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -1051,8 +1051,11 @@ ieee80211_tx_prepare(struct ieee80211_su
+
+ hdr = (struct ieee80211_hdr *) skb->data;
+
+- if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
++ if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
+ tx->sta = rcu_dereference(sdata->u.vlan.sta);
++ if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr)
++ return TX_DROP;
++ }
+ if (!tx->sta)
+ tx->sta = sta_info_get(sdata, hdr->addr1);
+