summaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-02-05 22:48:37 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2011-02-07 21:18:27 (GMT)
commit4f3123366f78cf34ce7caab923e2b3c4fe9e16c2 (patch)
tree44789fb3edce914460b6c7953939cfe5ab905441 /net/mac80211
parent180205bdb22b79cd7b2a07a5002dd747badc82f3 (diff)
downloadlinux-4f3123366f78cf34ce7caab923e2b3c4fe9e16c2.tar.xz
mac80211: as a 4-addr station, do not receive packets for other stations
Since 4-addr frames completely override the source address which will make it into the converted 802.3 frames, receiving frames for other 4-addr stations will confuse the bridging code. To be able to handle traffic for all connected devices, the bridge code will automatically turn on promiscuous mode, which triggers this problem. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Reported-by: Steve Brown <sbrown@cortland.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index b5f59ed..50c2c88 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2646,7 +2646,8 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx,
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;
}