mac80211: upgrade to a new unofficial snapshot based on wireless-testing+wireless-2.6

[openwrt-10.03/.git] / package / mac80211 / patches / 580-4addr_vlan_check.patch

diff --git a/package/mac80211/patches/580-4addr_vlan_check.patch b/package/mac80211/patches/580-4addr_vlan_check.patch
deleted file mode 100644 (file)
index 7079957..0000000
--- a/package/mac80211/patches/580-4addr_vlan_check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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);
-