diff options
author | ume <ume@FreeBSD.org> | 2003-12-07 11:23:59 +0000 |
---|---|---|
committer | ume <ume@FreeBSD.org> | 2003-12-07 11:23:59 +0000 |
commit | ac33b83fc2706126a74084cba417f5084ff93c1e (patch) | |
tree | b7fbbf9456a4b1d4f3cab80936920a56cdcae9e3 /sys | |
parent | 58cb5ad46ce4f6d153fcb51ee3523d84a345c82f (diff) | |
download | FreeBSD-src-ac33b83fc2706126a74084cba417f5084ff93c1e.zip FreeBSD-src-ac33b83fc2706126a74084cba417f5084ff93c1e.tar.gz |
use callout_*() rather than timeout().
Diffstat (limited to 'sys')
-rw-r--r-- | sys/netkey/key.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/netkey/key.c b/sys/netkey/key.c index 155b3c1..370c9de 100644 --- a/sys/netkey/key.c +++ b/sys/netkey/key.c @@ -498,6 +498,7 @@ static void key_sa_chgstate(struct secasvar *, u_int8_t); static void key_sp_dead(struct secpolicy *); static void key_sp_unlink(struct secpolicy *); static struct mbuf *key_alloc_mbuf(int); +static struct callout key_timehandler_ch; /* %%% IPsec policy management */ /* @@ -4537,7 +4538,7 @@ key_timehandler(arg) * should set timeout based on the most closest timer expiration. * we don't bother to do that yet. */ - (void)timeout(key_timehandler, (void *)0, hz); + callout_reset(&key_timehandler_ch, hz, key_timehandler, (void *)0); splx(s); return; @@ -7325,6 +7326,8 @@ key_init() bzero((caddr_t)&key_cb, sizeof(key_cb)); + callout_init(&key_timehandler_ch, 0); + for (i = 0; i < IPSEC_DIR_MAX; i++) LIST_INIT(&sptree[i]); @@ -7366,7 +7369,7 @@ key_init() ip6_def_policy->persist = 1; #endif - timeout(key_timehandler, (void *)0, hz); + callout_reset(&key_timehandler_ch, hz, key_timehandler, (void *)0); /* initialize key statistics */ keystat.getspi_count = 1; |