[src/trunk]: src/sys/netkey change key_timehandler to take void * as argument...

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

details:   https://anonhg.NetBSD.org/src/rev/d8dbf404dfcf
branches:  trunk
changeset: 521463:d8dbf404dfcf
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu Jan 31 07:05:43 2002 +0000

description:
change key_timehandler to take void * as argument.  sync with kame.
PR 14351

diffstat:

 sys/netkey/key.c |  13 ++++++-------
 sys/netkey/key.h |   4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diffs (66 lines):

diff -r fda6b1b333cf -r d8dbf404dfcf sys/netkey/key.c
--- a/sys/netkey/key.c  Thu Jan 31 06:37:30 2002 +0000
+++ b/sys/netkey/key.c  Thu Jan 31 07:05:43 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.57 2002/01/31 06:35:25 itojun Exp $  */
+/*     $NetBSD: key.c,v 1.58 2002/01/31 07:05:43 itojun Exp $  */
 /*     $KAME: key.c,v 1.203 2001/07/28 03:12:18 itojun Exp $   */
 
 /*
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.57 2002/01/31 06:35:25 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.58 2002/01/31 07:05:43 itojun Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -3839,7 +3839,8 @@
  * XXX: year 2038 problem may remain.
  */
 void
-key_timehandler(void)
+key_timehandler(arg)
+       void *arg;
 {
        u_int dir;
        int s;
@@ -4075,8 +4076,7 @@
                key_srandom();
        }
 
-       callout_reset(&key_timehandler_ch, hz,
-           (void *)key_timehandler, (void *)0);
+       callout_reset(&key_timehandler_ch, hz, key_timehandler, (void *)0);
 
        splx(s);
        return;
@@ -6899,8 +6899,7 @@
        ip6_def_policy.refcnt++;        /*never reclaim this*/
 #endif
 
-       callout_reset(&key_timehandler_ch, hz,
-           (void *)key_timehandler, (void *)0);
+       callout_reset(&key_timehandler_ch, hz, key_timehandler, (void *)0);
 
        /* initialize key statistics */
        keystat.getspi_count = 1;
diff -r fda6b1b333cf -r d8dbf404dfcf sys/netkey/key.h
--- a/sys/netkey/key.h  Thu Jan 31 06:37:30 2002 +0000
+++ b/sys/netkey/key.h  Thu Jan 31 07:05:43 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.h,v 1.8 2001/08/06 10:25:02 itojun Exp $   */
+/*     $NetBSD: key.h,v 1.9 2002/01/31 07:05:44 itojun Exp $   */
 /*     $KAME: key.h,v 1.19 2000/10/05 04:02:58 itojun Exp $    */
 
 /*
@@ -64,7 +64,7 @@
 extern int key_cmpspidx_withmask
        __P((struct secpolicyindex *, struct secpolicyindex *));
 extern int key_spdacquire __P((struct secpolicy *));
-extern void key_timehandler __P((void));
+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 *));