summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/560-4addr_vlan_check.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-12 03:10:03 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-12 03:10:03 +0000
commit5c8a4212a704139521c9ab8cc9cd7e52fc645ed6 (patch)
tree01eeb6acfb6bdb960509b63b891ec66a90e10f3c /package/mac80211/patches/560-4addr_vlan_check.patch
parent0b686a0ab95aca103224dcbed2e48e6722f07452 (diff)
mac80211: upgrade to a new unofficial snapshot based on wireless-testing+wireless-2.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19110 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 000000000..7079957ee
--- /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);
+