svn commit: r297727 - head/sys/net80211

[Adrian Chadd]

Author: adrian
Date: Sat Apr  9 00:54:02 2016
New Revision: 297727
URL: https://svnweb.freebsd.org/changeset/base/297727

Log:
  [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.

Modified:
  head/sys/net80211/ieee80211_adhoc.c

Modified: head/sys/net80211/ieee80211_adhoc.c
==============================================================================
--- head/sys/net80211/ieee80211_adhoc.c	Fri Apr  8 23:11:00 2016	(r297726)
+++ head/sys/net80211/ieee80211_adhoc.c	Sat Apr  9 00:54:02 2016	(r297727)
@@ -371,10 +371,7 @@ adhoc_input(struct ieee80211_node *ni, s
 		/*
 		 * 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,