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

[Sam Leffler]

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