From c0188d5c67c6010ffc6d34fc0bfcdac67b7e4eb1 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 11 Nov 2009 13:17:36 +0100
Subject: [PATCH] --- yaml --- r: 171746 b: refs/heads/master c:
 f501dba4c4c5bda1b64c941997ab7ece1d503945 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/rx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 95f979d84c69..15ab6b3aede1 100644
--- 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
index 006cf89df70b..6bce97ee2534 100644
--- 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