From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 27 16:27:00 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC918106564A;
	Sat, 27 Jun 2009 16:27:00 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A9EB98FC19;
	Sat, 27 Jun 2009 16:27:00 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5RGR0qo082373;
	Sat, 27 Jun 2009 16:27:00 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5RGR0Q1082372;
	Sat, 27 Jun 2009 16:27:00 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906271627.n5RGR0Q1082372@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sat, 27 Jun 2009 16:27:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195107 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Jun 2009 16:27:01 -0000

Author: rpaulo
Date: Sat Jun 27 16:26:59 2009
New Revision: 195107
URL: http://svn.freebsd.org/changeset/base/195107

Log:
  Make sure meshconf is present before trying to establish a peer link.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/mesh11s/sys/net80211/ieee80211_mesh.c

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sat Jun 27 15:33:39 2009	(r195106)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sat Jun 27 16:26:59 2009	(r195107)
@@ -696,7 +696,7 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 		/*
 		 * Ignore non-mesh STAs and STAs for other mesh networks.
 		 */
-		if (scan.meshid &&
+		if (scan.meshid && scan.meshconf &&
 		    memcmp(scan.meshid+2, ms->ms_id, ms->ms_idlen) != 0) {
 			IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni,
 			    "beacon not for our mesh (%s)", scan.meshid+2);