diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-10-03 16:00:03 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-03 16:00:03 -0400 |
| commit | 1eea72f03a139146f341e450cf56934b2e01a4d3 (patch) | |
| tree | 65c8d14751a9920263722eea64784e87a246ec66 /net/mac80211/rx.c | |
| parent | 569943d0639c85a451ea853087cbd5f738247dd9 (diff) | |
| parent | f69727fd78fa761dc49ee3091c432a8c6ab81292 (diff) | |
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 54395d7583b..674eac1f996 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3056,6 +3056,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)) { |