diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-04 14:45:14 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-04 14:45:14 -0500 |
| commit | 01925efdf7e03b4b803b5c9f985163d687f7f017 (patch) | |
| tree | 6c318f9bf002efac5ccd87e8edad35863d72bd17 /net/mac80211/rx.c | |
| parent | a1b13b9ad3759dca24c6b721ee026c540a4e6564 (diff) | |
| parent | 8ce9beac4661f576ea0d518b9f086bb52a171a37 (diff) | |
| download | talos-op-linux-01925efdf7e03b4b803b5c9f985163d687f7f017.tar.gz talos-op-linux-01925efdf7e03b4b803b5c9f985163d687f7f017.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/pcie/drv.c
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 f0247a43a75c..0011ac815097 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -3073,6 +3073,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)) { |
