From owner-svn-src-head@freebsd.org  Tue Nov 22 06:53:53 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5719FC4E11A;
 Tue, 22 Nov 2016 06:53:53 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 26985E05;
 Tue, 22 Nov 2016 06:53:53 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAM6rqQj092174;
 Tue, 22 Nov 2016 06:53:52 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAM6rq8e092173;
 Tue, 22 Nov 2016 06:53:52 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201611220653.uAM6rq8e092173@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 22 Nov 2016 06:53:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r308956 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Nov 2016 06:53:53 -0000

Author: adrian
Date: Tue Nov 22 06:53:52 2016
New Revision: 308956
URL: https://svnweb.freebsd.org/changeset/base/308956

Log:
  [net80211] Only send out a probe request if we see an unknown IBSS node that matches our SSID.

Modified:
  head/sys/net80211/ieee80211_adhoc.c

Modified: head/sys/net80211/ieee80211_adhoc.c
==============================================================================
--- head/sys/net80211/ieee80211_adhoc.c	Tue Nov 22 06:29:08 2016	(r308955)
+++ head/sys/net80211/ieee80211_adhoc.c	Tue Nov 22 06:53:52 2016	(r308956)
@@ -773,22 +773,21 @@ adhoc_recv_mgmt(struct ieee80211_node *n
 				 * filling the node table with nodes that
 				 * aren't ours.
 				 */
-				if (ieee80211_ibss_node_check_new(ni, &scan))
+				if (ieee80211_ibss_node_check_new(ni, &scan)) {
 					ni = ieee80211_add_neighbor(vap, wh, &scan);
-				else
+					/*
+					 * Send a probe request so we announce 11n
+					 * capabilities.
+					 */
+					ieee80211_send_probereq(ni, /* node */
+					    vap->iv_myaddr, /* SA */
+					    ni->ni_macaddr, /* DA */
+					    vap->iv_bss->ni_bssid, /* BSSID */
+					    vap->iv_bss->ni_essid,
+					    vap->iv_bss->ni_esslen); /* SSID */
+				} else
 					ni = NULL;
 
-				/*
-				 * Send a probe request so we announce 11n
-				 * capabilities.
-				 */
-				ieee80211_send_probereq(ni, /* node */
-					vap->iv_myaddr, /* SA */
-					ni->ni_macaddr, /* DA */
-					vap->iv_bss->ni_bssid, /* BSSID */
-					vap->iv_bss->ni_essid,
-					vap->iv_bss->ni_esslen); /* SSID */
-
 			} else if (ni->ni_capinfo == 0) {
 				/*
 				 * Update faked node created on transmit.