---

yaml --- r: 171746 b: refs/heads/master c: f501dba h: refs/heads/master v: v3
git-mirror · Nov 13, 2009 · c0188d5 · c0188d5
1 parent 2e3109a
commit c0188d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61fa713c751683da915fa0c1aa502be85822c357
+refs/heads/master: f501dba4c4c5bda1b64c941997ab7ece1d503945
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
@@ -1236,7 +1236,7 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
 	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