From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 20:29:47 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 9C057106564A;
	Tue,  9 Jun 2009 20:29:47 +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 8B4298FC17;
	Tue,  9 Jun 2009 20:29:47 +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 n59KTlBb082940;
	Tue, 9 Jun 2009 20:29:47 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59KTlTV082939;
	Tue, 9 Jun 2009 20:29:47 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906092029.n59KTlTV082939@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 20:29:47 +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: r193857 - 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: Tue, 09 Jun 2009 20:29:47 -0000

Author: rpaulo
Date: Tue Jun  9 20:29:47 2009
New Revision: 193857
URL: http://svn.freebsd.org/changeset/base/193857

Log:
  Don't transition to run state if a meshid is not set.
  
  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	Tue Jun  9 20:27:30 2009	(r193856)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 20:29:47 2009	(r193857)
@@ -164,9 +164,10 @@ mesh_newstate(struct ieee80211vap *vap, 
 		switch (ostate) {
 		case IEEE80211_S_INIT:
 			if (vap->iv_des_chan != IEEE80211_CHAN_ANYC &&
-			    !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) {
+			    !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan &&
+			    vap->iv_meshidlen != 0)) {
 			    /*
-			     * Already have a channel; bypass the
+			     * Already have a channel and a mesh ID; bypass the
 			     * scan and startup immediately.
 			     */
 			     ieee80211_create_mbss(vap, vap->iv_des_chan);