summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authormarkj <markj@FreeBSD.org>2016-02-18 01:58:26 +0000
committermarkj <markj@FreeBSD.org>2016-02-18 01:58:26 +0000
commit4c666259fab90ff6b6643cb916c1cb5e1855dd8c (patch)
tree9e582b6b15f368f7ac64ddda5d4c48004f444696 /usr.sbin
parenta0e698febe97f5729c91525244367209f36ae22a (diff)
downloadFreeBSD-src-4c666259fab90ff6b6643cb916c1cb5e1855dd8c.zip
FreeBSD-src-4c666259fab90ff6b6643cb916c1cb5e1855dd8c.tar.gz
Use the _SAFE loop variant, since the loop body may remove queue entries.
PR: 207146 MFC after: 3 days
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/rtsold/rtsold.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index 1482798..9cfe5c3 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.c
@@ -554,7 +554,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);
@@ -649,7 +649,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",
OpenPOWER on IntegriCloud