[src/trunk]: src/sys/net Mark the rt_timer callout MPSAFE and move the first ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f069fe091aa4
branches:  trunk
changeset: 346498:f069fe091aa4
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jul 15 09:25:47 2016 +0000

description:
Mark the rt_timer callout MPSAFE and move the first reset a few lines
down so the the workqueue is properly prepared (the latter being more
a cosmetical change). Ok: ozaki-r@

diffstat:

 sys/net/route.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 073d2fe31d78 -r f069fe091aa4 sys/net/route.c
--- a/sys/net/route.c   Fri Jul 15 07:40:09 2016 +0000
+++ b/sys/net/route.c   Fri Jul 15 09:25:47 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: route.c,v 1.171 2016/07/13 09:56:20 hannken Exp $      */
+/*     $NetBSD: route.c,v 1.172 2016/07/15 09:25:47 martin Exp $       */
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.171 2016/07/13 09:56:20 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.172 2016/07/15 09:25:47 martin Exp $");
 
 #include <sys/param.h>
 #ifdef RTFLUSH_DEBUG
@@ -1160,12 +1160,12 @@
        assert(rt_init_done == 0);
 
        LIST_INIT(&rttimer_queue_head);
-       callout_init(&rt_timer_ch, 0);
-       callout_reset(&rt_timer_ch, hz, rt_timer_timer, NULL);
+       callout_init(&rt_timer_ch, CALLOUT_MPSAFE);
        error = workqueue_create(&rt_timer_wq, "rt_timer",
            rt_timer_work, NULL, PRI_SOFTNET, IPL_SOFTNET, WQ_MPSAFE);
        if (error)
                panic("%s: workqueue_create failed (%d)\n", __func__, error);
+       callout_reset(&rt_timer_ch, hz, rt_timer_timer, NULL);
        rt_init_done = 1;
 }