diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-05-25 00:01:30 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-25 00:01:30 +0200 |
| commit | dde7dc759b777f385fc5df2af691c82eb455c7f3 (patch) | |
| tree | 5e8f1fcd10a6b264d60bc8a0503656c0611de222 /net/mac80211/rx.c | |
| parent | {cfg,mac}80211: move mandatory rates calculation to cfg80211 (diff) | |
| parent | mac80211: close AP_VLAN interfaces before unregistering all (diff) | |
| download | linux-dde7dc759b777f385fc5df2af691c82eb455c7f3.tar.xz linux-dde7dc759b777f385fc5df2af691c82eb455c7f3.zip | |
Merge remote-tracking branch 'mac80211/master' into mac80211-next
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 7507f7cdd68c..bdd7b4a719e9 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3054,6 +3054,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)) |