From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 11 Nov 2009 05:15:41 +0000 (+0000)
Subject: mac80211: fix a bug in broadcast handling of wds sta interfaces
X-Git-Tag: reboot~21917
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=20107c752ee937a7fbe365367e22f10679657c87;p=openwrt%2Fstaging%2Fpepe2k.git

mac80211: fix a bug in broadcast handling of wds sta interfaces

SVN-Revision: 18363
---

diff --git a/package/mac80211/patches/510-mac80211_4addr_vlan.patch b/package/mac80211/patches/510-mac80211_4addr_vlan.patch
index ac92fe54b1..d3d1e82930 100644
--- a/package/mac80211/patches/510-mac80211_4addr_vlan.patch
+++ b/package/mac80211/patches/510-mac80211_4addr_vlan.patch
@@ -213,6 +213,15 @@
  
  	return ieee80211_data_to_8023(rx->skb, dev->dev_addr, sdata->vif.type);
  }
+@@ -1285,7 +1292,7 @@ ieee80211_deliver_skb(struct ieee80211_r
+ 	if ((sdata->vif.type == NL80211_IFTYPE_AP ||
+ 	     sdata->vif.type == NL80211_IFTYPE_AP_VLAN) &&
+ 	    !(sdata->flags & IEEE80211_SDATA_DONT_BRIDGE_PACKETS) &&
+-	    (rx->flags & IEEE80211_RX_RA_MATCH)) {
++	    (rx->flags & IEEE80211_RX_RA_MATCH) && !rx->sdata->use_4addr) {
+ 		if (is_multicast_ether_addr(ehdr->h_dest)) {
+ 			/*
+ 			 * send multicast frames both to higher layers in
 @@ -1590,6 +1597,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_
  {
  	struct net_device *dev = rx->dev;