diff options
| author | adrian <adrian@FreeBSD.org> | 2016-04-09 00:54:02 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2016-04-09 00:54:02 +0000 |
| commit | 587ad3ebbb7c664174d14c713098341503b82961 (patch) | |
| tree | 35de280724215f26d18ac4353abbda54fc8876f5 /sys/net80211 | |
| parent | f96cd9f3c12e20c84846e5fb8d19be144de77fbc (diff) | |
| download | FreeBSD-src-587ad3ebbb7c664174d14c713098341503b82961.zip FreeBSD-src-587ad3ebbb7c664174d14c713098341503b82961.tar.gz | |
[net80211] revert part of r282405 in order to restore IBSS behaviour.
This prevents nodes being created for peers on BSSes that are not our own.
(Ie, same channel, IBSS, but different BSS.)
The "IBSS merge" thing was fixed by me enabling "see all beacons" in
the ath(4) driver a few months ago. Trouble is, we now need the filtering
again.
Tested:
* ath(4), IBSS, on a very busy IBSS channel with lots (> 15) IBSS networks.
PR: kern/208643
Sponsored by: Eva Automation, Inc.
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_adhoc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c index a9334d0..eca9877 100644 --- a/sys/net80211/ieee80211_adhoc.c +++ b/sys/net80211/ieee80211_adhoc.c @@ -371,10 +371,7 @@ adhoc_input(struct ieee80211_node *ni, struct mbuf *m, /* * Validate the bssid. */ - if (!(type == IEEE80211_FC0_TYPE_MGT && - (subtype == IEEE80211_FC0_SUBTYPE_BEACON || - subtype == IEEE80211_FC0_SUBTYPE_PROBE_RESP)) && - !IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && + if (!IEEE80211_ADDR_EQ(bssid, vap->iv_bss->ni_bssid) && !IEEE80211_ADDR_EQ(bssid, ifp->if_broadcastaddr)) { /* not interested in */ IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, |
