diff options
author | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
---|---|---|
committer | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:14:58 +0100 |
commit | 4fcea1cf4c9da385a2fa90dc631ff453bbfdbcb1 (patch) | |
tree | db2b279c1ef40e8170883efd1c0bd118d1803aec /net/mac80211/rx.c | |
parent | b153532021104be5cc1abc3b6b60c004739b31c7 (diff) | |
parent | 3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff) |
Merge tag 'v3.10.19' into linux-lnglinux-lng-v3.10.19-final
This is the 3.10.19 stable release
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 83f6d29202aa..ec09bcba9bae 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3002,6 +3002,9 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx, case NL80211_IFTYPE_ADHOC: if (!bssid) return 0; + if (ether_addr_equal(sdata->vif.addr, hdr->addr2) || + ether_addr_equal(sdata->u.ibss.bssid, hdr->addr2)) + return 0; if (ieee80211_is_beacon(hdr->frame_control)) { return 1; } else if (!ieee80211_bssid_match(bssid, sdata->u.ibss.bssid)) { |