svn commit: r195107 - projects/mesh11s/sys/net80211

[Rui Paulo]

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);