Author: bz
Date: Mon Jun 6 14:01:09 2016
New Revision: 301508
URL: https://svnweb.freebsd.org/changeset/base/301508
Log:
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
Modified:
head/sys/netinet6/nd6.c
Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c Mon Jun 6 13:32:15 2016 (r301507)
+++ head/sys/netinet6/nd6.c Mon Jun 6 14:01:09 2016 (r301508)
@@ -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();
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
