Date: Tue, 9 Jun 2009 20:29:47 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r193857 - projects/mesh11s/sys/net80211 Message-ID: <200906092029.n59KTlTV082939@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906092029.n59KTlTV082939>