diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-13 12:06:30 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-13 12:06:30 +0000 |
| commit | 54a3a4d441e9eaceb86989f0b466e77815ab6129 (patch) | |
| tree | eab08ab86a34f0a071467435b42f733d1af013cf /net/mac80211/rx.c | |
| parent | 7c9373fbcd0b29f6ccc28407c11ecd51cfa7a3c2 (diff) | |
| parent | 3729ed7c6aa8c5b9eee8f832e4a246b8fa1d56b5 (diff) | |
Merge tag 'v3.10.19' into linux-linaro-lsk
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 83f6d29202a..ec09bcba9ba 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)) { |