svn commit: r295898 - stable/10/usr.sbin/rtsold

Mark Johnston markj at FreeBSD.org
Mon Feb 22 20:20:11 UTC 2016


Author: markj
Date: Mon Feb 22 20:20:10 2016
New Revision: 295898
URL: https://svnweb.freebsd.org/changeset/base/295898

Log:
  MFC r295737:
  Use the _SAFE loop variant.
  
  PR:		207146
  Approved by:	re (gjb, glebius)

Modified:
  stable/10/usr.sbin/rtsold/rtsold.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/rtsold/rtsold.c
==============================================================================
--- stable/10/usr.sbin/rtsold/rtsold.c	Mon Feb 22 20:18:10 2016	(r295897)
+++ stable/10/usr.sbin/rtsold/rtsold.c	Mon Feb 22 20:20:10 2016	(r295898)
@@ -609,7 +609,7 @@ rtsol_check_timer(void)
 	struct timespec now, rtsol_timer;
 	struct ifinfo *ifi;
 	struct rainfo *rai;
-	struct ra_opt *rao;
+	struct ra_opt *rao, *raotmp;
 	int flags;
 
 	clock_gettime(CLOCK_MONOTONIC_FAST, &now);
@@ -704,7 +704,8 @@ rtsol_check_timer(void)
 			int expire = 0;
 
 			TAILQ_FOREACH(rai, &ifi->ifi_rainfo, rai_next) {
-				TAILQ_FOREACH(rao, &rai->rai_ra_opt, rao_next) {
+				TAILQ_FOREACH_SAFE(rao, &rai->rai_ra_opt,
+				    rao_next, raotmp) {
 					warnmsg(LOG_DEBUG, __func__,
 					    "RA expiration timer: "
 					    "type=%d, msg=%s, expire=%s",


More information about the svn-src-all mailing list