diff options
| -rw-r--r-- | sys/netipsec/key.c | 13 | ||||
| -rw-r--r-- | sys/netipsec/key.h | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c index ea03471..47802a8 100644 --- a/sys/netipsec/key.c +++ b/sys/netipsec/key.c @@ -410,6 +410,10 @@ struct sadb_msghdr { int extlen[SADB_EXT_MAX + 1]; }; +#ifndef IPSEC_DEBUG2 +static struct callout key_timer; +#endif + static struct secasvar *key_allocsa_policy __P((const struct secasindex *)); static void key_freesp_so __P((struct secpolicy **)); static struct secasvar *key_do_allocsa_policy __P((struct secashead *, u_int)); @@ -4525,8 +4529,8 @@ key_flush_spacq(time_t now) * and do to remove or to expire. * XXX: year 2038 problem may remain. */ -void -key_timehandler(void) +static void +key_timehandler(void *arg) { VNET_ITERATOR_DECL(vnet_iter); time_t now = time_second; @@ -4544,7 +4548,7 @@ key_timehandler(void) #ifndef IPSEC_DEBUG2 /* do exchange to tick time !! */ - (void)timeout((void *)key_timehandler, (void *)0, hz); + callout_schedule(&key_timer, hz); #endif /* IPSEC_DEBUG2 */ } @@ -7769,7 +7773,8 @@ key_init(void) SPACQ_LOCK_INIT(); #ifndef IPSEC_DEBUG2 - timeout((void *)key_timehandler, (void *)0, hz); + callout_init(&key_timer, CALLOUT_MPSAFE); + callout_reset(&key_timer, hz, key_timehandler, NULL); #endif /*IPSEC_DEBUG2*/ /* initialize key statistics */ diff --git a/sys/netipsec/key.h b/sys/netipsec/key.h index f246dbc..2a8c19e 100644 --- a/sys/netipsec/key.h +++ b/sys/netipsec/key.h @@ -97,7 +97,6 @@ extern struct secpolicy *key_msg2sp __P((struct sadb_x_policy *, extern struct mbuf *key_sp2msg __P((struct secpolicy *)); extern int key_ismyaddr __P((struct sockaddr *)); extern int key_spdacquire __P((struct secpolicy *)); -extern void key_timehandler __P((void)); extern u_long key_random __P((void)); extern void key_randomfill __P((void *, size_t)); extern void key_freereg __P((struct socket *)); |
