mac80211: backport latest version from trunk

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

diff --git a/package/mac80211/patches/580-mac80211_no_promisc_4addr.patch b/package/mac80211/patches/580-mac80211_no_promisc_4addr.patch
deleted file mode 100644 (file)
index f375909..0000000
--- a/package/mac80211/patches/580-mac80211_no_promisc_4addr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -2609,7 +2609,8 @@ static int prepare_for_handlers(struct i
-                       return 0;
-               if (!multicast &&
-                   compare_ether_addr(sdata->vif.addr, hdr->addr1) != 0) {
--                      if (!(sdata->dev->flags & IFF_PROMISC))
-+                      if (!(sdata->dev->flags & IFF_PROMISC) ||
-+                          sdata->u.mgd.use_4addr)
-                               return 0;
-                       status->rx_flags &= ~IEEE80211_RX_RA_MATCH;
-               }