diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-05-20 21:19:01 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-05-20 21:19:01 +0200 |
commit | ba7c96bec59d1c11cf9eaf6489e70e22f53da31b (patch) | |
tree | 6d5c92ee3b4fa2d422f11d05da308a7cde614a5f /net/mac80211/rx.c | |
parent | bnx2x: Fix GSO for 57710/57711 chips (diff) | |
parent | ath9k: fix draining aggregation tid buffers (diff) | |
download | linux-ba7c96bec59d1c11cf9eaf6489e70e22f53da31b.tar.xz linux-ba7c96bec59d1c11cf9eaf6489e70e22f53da31b.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r-- | net/mac80211/rx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index c8447af76ead..8e2952620256 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3036,6 +3036,9 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx, * and location updates. Note that mac80211 * itself never looks at these frames. */ + if (!multicast && + !ether_addr_equal(sdata->vif.addr, hdr->addr1)) + return 0; if (ieee80211_is_public_action(hdr, skb->len)) return 1; if (!ieee80211_is_beacon(hdr->frame_control)) |