Move the callout_reset() to the end of the work not having it stick

before we do anything.

Obtained from:	projects/vnet
MFC after:	2 week
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
bz 2016-06-06 14:01:09 +00:00
parent 28309d8186
commit aaac6c5a13

View File

@ -896,9 +896,6 @@ nd6_timer(void *arg)
struct nd_prefix *pr, *npr;
struct in6_ifaddr *ia6, *nia6;
callout_reset(&V_nd6_timer_ch, V_nd6_prune * hz,
nd6_timer, curvnet);
TAILQ_INIT(&drq);
/* expire default router list */
@ -1025,6 +1022,10 @@ nd6_timer(void *arg)
prelist_remove(pr);
}
}
callout_reset(&V_nd6_timer_ch, V_nd6_prune * hz,
nd6_timer, curvnet);
CURVNET_RESTORE();
}