Convert to new timeouts. (art@ ok)

1 files changed, 10 insertions, 4 deletions

diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c
index 07e920e523c..f4942b73e0e 100644
--- a/sys/dev/ic/fxp.c
+++ b/sys/dev/ic/fxp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fxp.c,v 1.6 2000/06/03 02:55:04 jason Exp $	*/
+/*	$OpenBSD: fxp.c,v 1.7 2000/07/20 16:22:26 ho Exp $	*/
 /*	$NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $	*/
 
 /*
@@ -46,6 +46,7 @@
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
+#include <sys/timeout.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -422,6 +423,11 @@ fxp_attach_common(sc, enaddr, intrstr)
 	 */
 	powerhook_establish(fxp_power, sc);
 
+	/*
+	 * Initialize timeout for statistics update.
+	 */
+	timeout_set(&sc->stats_update_to, fxp_stats_update, sc);
+
 	return (0);
 
  fail:
@@ -935,7 +941,7 @@ fxp_stats_update(arg)
 	/*
 	 * Schedule another timeout one second from now.
 	 */
-	timeout(fxp_stats_update, sc, hz);
+	timeout_add(&sc->stats_update_to, hz);
 }
 
 /*
@@ -961,7 +967,7 @@ fxp_stop(sc, drain)
 	/*
 	 * Cancel stats updater.
 	 */
-	untimeout(fxp_stats_update, sc);
+	timeout_del(&sc->stats_update_to);
 
 	/*
 	 * Issue software reset
@@ -1177,7 +1183,7 @@ fxp_init(xsc)
 	/*
 	 * Start stats updater.
 	 */
-	timeout(fxp_stats_update, sc, hz);
+	timeout_add(&sc->stats_update_to, hz);
 }
 
 /*