summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2000-11-08 14:25:25 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2000-11-08 14:25:25 +0000
commitf35789708683a1b5b8ee0ec2a1ae8d9e95e68c78 (patch)
tree90edbbeffc89b60390b61364b56b1d0524722efc /sys
parent7dbcb2c94fdc4e0bf29091d61358406e17ff392b (diff)
Initialize the timeout in attach, not wi_init.
The difference is that we do not risk reinitializing a pending timeout.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pcmcia/if_wi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pcmcia/if_wi.c b/sys/dev/pcmcia/if_wi.c
index 4f6dd0cc6ae..b71504be7d7 100644
--- a/sys/dev/pcmcia/if_wi.c
+++ b/sys/dev/pcmcia/if_wi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi.c,v 1.16 2000/09/17 19:10:55 provos Exp $ */
+/* $OpenBSD: if_wi.c,v 1.17 2000/11/08 14:25:24 art Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -133,7 +133,7 @@ u_int32_t widebug = WIDEBUG;
#if !defined(lint) && !defined(__OpenBSD__)
static const char rcsid[] =
- "$OpenBSD: if_wi.c,v 1.16 2000/09/17 19:10:55 provos Exp $";
+ "$OpenBSD: if_wi.c,v 1.17 2000/11/08 14:25:24 art Exp $";
#endif /* lint */
#ifdef foo
@@ -307,6 +307,7 @@ wi_pcmcia_attach(parent, self, aux)
gen.wi_len = 2;
wi_read_record(sc, &gen);
sc->wi_has_wep = gen.wi_val;
+ timeout_set(&sc->sc_timo, wi_inquire, sc);
bzero((char *)&sc->wi_stats, sizeof(sc->wi_stats));
@@ -1283,7 +1284,6 @@ wi_init(xsc)
ifp->if_flags |= IFF_RUNNING;
ifp->if_flags &= ~IFF_OACTIVE;
- timeout_set(&sc->sc_timo, wi_inquire, sc);
timeout_add(&sc->sc_timo, hz * 60);
return;