New timeouts, drahn@ sez go ahead.

1 files changed, 6 insertions, 3 deletions

diff --git a/sys/dev/ofw/ofnet.c b/sys/dev/ofw/ofnet.c
index 0d7e9ae6e1a..d252885e603 100644
--- a/sys/dev/ofw/ofnet.c
+++ b/sys/dev/ofw/ofnet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofnet.c,v 1.5 2001/06/25 04:47:33 fgsch Exp $	*/
+/*	$OpenBSD: ofnet.c,v 1.6 2001/08/08 21:49:16 miod Exp $	*/
 /*	$NetBSD: ofnet.c,v 1.4 1996/10/16 19:33:21 ws Exp $	*/
 
 /*
@@ -69,6 +69,7 @@ struct ofn_softc {
 	int sc_phandle;
 	int sc_ihandle;
 	struct arpcom sc_arpcom;
+	struct timeout sc_tmo;
 	void *dmabuf;
 };
 
@@ -162,6 +163,8 @@ printf("\nethernet dev: path %s\n", path);
 	ifp->if_watchdog = ofnwatchdog;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS;
 
+	timeout_set(&of->sc_tmo, ofntimer, of);
+
 	if_attach(ifp);
 	ether_ifattach(ifp);
 
@@ -246,7 +249,7 @@ ofntimer(of)
 	struct ofn_softc *of;
 {
 	ofnread(of);
-	timeout(ofntimer, of, 1);
+	timeout_add(&of->sc_tmo, 1);
 }
 
 static void
@@ -269,7 +272,7 @@ static void
 ofnstop(of)
 	struct ofn_softc *of;
 {
-	untimeout(ofntimer, of);
+	timeout_del(&of->sc_tmo);
 	of->sc_arpcom.ac_if.if_flags &= ~IFF_RUNNING;
 }