From owner-svn-src-projects@FreeBSD.ORG  Sun Jun 28 16:51:59 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 172441065672;
	Sun, 28 Jun 2009 16:51:59 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 05BB28FC1A;
	Sun, 28 Jun 2009 16:51:59 +0000 (UTC) (envelope-from sam@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 n5SGpwYS016692;
	Sun, 28 Jun 2009 16:51:58 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5SGpwCd016690;
	Sun, 28 Jun 2009 16:51:58 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200906281651.n5SGpwCd016690@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sun, 28 Jun 2009 16:51:58 +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: r195140 - 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: Sun, 28 Jun 2009 16:51:59 -0000

Author: sam
Date: Sun Jun 28 16:51:58 2009
New Revision: 195140
URL: http://svn.freebsd.org/changeset/base/195140

Log:
  o rewrite goto as a loop
  o mark need to check for infinite loop

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

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sun Jun 28 16:50:38 2009	(r195139)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sun Jun 28 16:51:58 2009	(r195140)
@@ -306,12 +306,11 @@ mesh_generateid(struct ieee80211vap *vap
 {
 	uint16_t r;
 
-restart:
-	get_random_bytes(&r, 2);
-	ieee80211_iterate_nodes(&vap->iv_ic->ic_sta, mesh_checkid, &r);
-	if (r == 0)
-		goto restart;
-
+	/* XXX max iterations? */
+	do {
+		get_random_bytes(&r, 2);
+		ieee80211_iterate_nodes(&vap->iv_ic->ic_sta, mesh_checkid, &r);
+	} while (r == 0);
 	return r;
 }