summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2000-03-23 16:37:53 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2000-03-23 16:37:53 +0000
commit6455b3e70e133dda2c4218d3b7700fe8fd840a9d (patch)
treede363e785b611def6b58ad0dfc7f385deaf9e9cf /sys/net
parent6b77534bb06327406a530f93a2a8adc358642190 (diff)
New timeout code.
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/route.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/net/route.c b/sys/net/route.c
index e1b594bb0ee..edbc55662fe 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.17 2000/03/22 16:50:24 itojun Exp $ */
+/* $OpenBSD: route.c,v 1.18 2000/03/23 16:37:52 art Exp $ */
/* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */
/*
@@ -768,6 +768,8 @@ static int rt_init_done = 0;
void
rt_timer_init()
{
+ static struct timeout rt_timer_timeout;
+
assert(rt_init_done == 0);
#if 0
@@ -776,7 +778,8 @@ rt_timer_init()
#endif
LIST_INIT(&rttimer_queue_head);
- timeout(rt_timer_timer, NULL, hz); /* every second */
+ timeout_set(&rt_timer_timeout, rt_timer_timer, &rt_timer_timeout);
+ timeout_add(&rt_timer_timeout, hz); /* every second */
rt_init_done = 1;
}
@@ -908,6 +911,7 @@ void
rt_timer_timer(arg)
void *arg;
{
+ struct timeout *to = (struct timeout *)arg;
struct rttimer_queue *rtq;
struct rttimer *r;
long current_time;
@@ -934,5 +938,5 @@ rt_timer_timer(arg)
}
splx(s);
- timeout(rt_timer_timer, NULL, hz); /* every second */
+ timeout_add(to, hz); /* every second */
}