From 4b8dcbcc35d4a7005d4b84b767edc12cf3995158 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Thu, 16 Sep 2004 21:55:03 +0000
Subject: [PATCH] timeout/untimeout ==> callout_*

---
 sys/netproto/atalk/aarp.c       | 16 ++++++++--------
 sys/netproto/atalk/at_control.c |  8 ++++----
 sys/netproto/atalk/at_var.h     |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sys/netproto/atalk/aarp.c b/sys/netproto/atalk/aarp.c
index ca99a5acc5..89acb384ec 100644
--- a/sys/netproto/atalk/aarp.c
+++ b/sys/netproto/atalk/aarp.c
@@ -3,7 +3,7 @@
  * All Rights Reserved.
  *
  * $FreeBSD: src/sys/netatalk/aarp.c,v 1.12.2.2 2001/06/23 20:43:09 iedowse Exp $
- * $DragonFly: src/sys/netproto/atalk/aarp.c,v 1.13 2004/08/02 13:22:33 joerg Exp $
+ * $DragonFly: src/sys/netproto/atalk/aarp.c,v 1.14 2004/09/16 21:55:03 joerg Exp $
  */
 
 #include "opt_atalk.h"
@@ -68,8 +68,7 @@ u_char	aarp_org_code[ 3 ] = {
     0x00, 0x00, 0x00,
 };
 
-static struct callout_handle aarptimer_ch =
-    CALLOUT_HANDLE_INITIALIZER(&aarptimer_ch);
+static struct callout aarptimer_ch;
 
 static void
 aarptimer(void *ignored)
@@ -77,7 +76,6 @@ aarptimer(void *ignored)
     struct aarptab	*aat;
     int			i, s;
 
-    aarptimer_ch = timeout( aarptimer, (caddr_t)0, AARPT_AGE * hz );
     aat = aarptab;
     for ( i = 0; i < AARPTAB_SIZE; i++, aat++ ) {
 	if ( aat->aat_flags == 0 || ( aat->aat_flags & ATF_PERM ))
@@ -89,6 +87,7 @@ aarptimer(void *ignored)
 	aarptfree( aat );
 	splx( s );
     }
+    callout_reset(&aarptimer_ch, AARPT_AGE * hz, aarptimer, NULL);
 }
 
 /* 
@@ -364,7 +363,7 @@ at_aarpinput( struct arpcom *ac, struct mbuf *m)
 	     * probed for the same address we'd like to use. Change the
 	     * address we're probing for.
 	     */
-	    untimeout( aarpprobe, ac, aa->aa_ch );
+	    callout_stop(&aa->aa_ch);
 	    wakeup( aa );
 	    m_freem( m );
 	    return;
@@ -489,7 +488,8 @@ aarptnew( addr )
 
     if ( first ) {
 	first = 0;
-	aarptimer_ch = timeout( aarptimer, (caddr_t)0, hz );
+	callout_init(&aarptimer_ch);
+	callout_reset(&aarptimer_ch, hz, aarptimer, NULL);
     }
     aat = &aarptab[ AARPTAB_HASH( *addr ) * AARPTAB_BSIZ ];
     for ( n = 0; n < AARPTAB_BSIZ; n++, aat++ ) {
@@ -549,7 +549,7 @@ aarpprobe( void *arg )
 	wakeup( aa );
 	return;
     } else {
-	aa->aa_ch = timeout( aarpprobe, (caddr_t)ac, hz / 5 );
+	callout_reset(&aa->aa_ch, hz / 5, aarpprobe, ac);
     }
 
     if (( m = m_gethdr( MB_DONTWAIT, MT_DATA )) == NULL ) {
@@ -615,7 +615,7 @@ aarp_clean(void)
     struct aarptab	*aat;
     int			i;
 
-    untimeout( aarptimer, 0, aarptimer_ch );
+    callout_stop(&aarptimer_ch);
     for ( i = 0, aat = aarptab; i < AARPTAB_SIZE; i++, aat++ ) {
 	if ( aat->aat_hold ) {
 	    m_freem( aat->aat_hold );
diff --git a/sys/netproto/atalk/at_control.c b/sys/netproto/atalk/at_control.c
index 010e5254a6..b027605f99 100644
--- a/sys/netproto/atalk/at_control.c
+++ b/sys/netproto/atalk/at_control.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
- * $DragonFly: src/sys/netproto/atalk/at_control.c,v 1.6 2004/03/23 22:19:08 hsu Exp $
+ * $DragonFly: src/sys/netproto/atalk/at_control.c,v 1.7 2004/09/16 21:55:03 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -138,8 +138,8 @@ at_control(struct socket *so, u_long cmd, caddr_t data,
 	 * allocate a fresh one. 
 	 */
 	if ( aa == (struct at_ifaddr *) 0 ) {
-	    aa0 = malloc(sizeof(struct at_ifaddr), M_IFADDR, M_WAITOK);
-	    bzero(aa0, sizeof(struct at_ifaddr));
+	    aa0 = malloc(sizeof(struct at_ifaddr), M_IFADDR, M_WAITOK | M_ZERO);
+	    callout_init(&aa0->aa_ch);
 	    if (( aa = at_ifaddr ) != NULL ) {
 		/*
 		 * Don't let the loopback be first, since the first
@@ -521,7 +521,7 @@ at_ifinit( ifp, aa, sat )
 		 * start off the probes as an asynchronous activity.
 		 * though why wait 200mSec?
 		 */
-		aa->aa_ch = timeout( aarpprobe, (caddr_t)ifp, hz / 5 );
+		callout_reset(&aa->aa_ch, hz / 5, aarpprobe, ifp);
 		if ( tsleep( aa, PCATCH, "at_ifinit", 0 )) {
 		    /*
 		     * theoretically we shouldn't time out here
diff --git a/sys/netproto/atalk/at_var.h b/sys/netproto/atalk/at_var.h
index c98c1d5d78..e604e04509 100644
--- a/sys/netproto/atalk/at_var.h
+++ b/sys/netproto/atalk/at_var.h
@@ -21,7 +21,7 @@
  *	netatalk@itd.umich.edu
  *
  * $FreeBSD: src/sys/netatalk/at_var.h,v 1.10 1999/12/29 04:45:57 peter Exp $
- * $DragonFly: src/sys/netproto/atalk/at_var.h,v 1.2 2003/06/17 04:28:48 dillon Exp $
+ * $DragonFly: src/sys/netproto/atalk/at_var.h,v 1.3 2004/09/16 21:55:03 joerg Exp $
  */
 
 #ifndef _NETATALK_AT_VAR_H_
@@ -40,7 +40,7 @@ struct at_ifaddr {
     int			  aa_flags;
     u_short		  aa_firstnet, aa_lastnet;
     int			  aa_probcnt;
-    struct callout_handle aa_ch;
+    struct callout        aa_ch;
     struct at_ifaddr	  *aa_next;
 };
 
-- 
2.41.0