summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-01-10 21:38:03 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-01-10 21:38:03 +0000
commit10b11a4a61547a3b37cf92967e7403f24a8e4dd6 (patch)
tree77ed238b3d8ecfd1981196c35ac498213396c443 /sys/dev
parentc33f064f98bcaa25da7e5ab3f76776400636c2d2 (diff)
Don't call wi_cor_reset() in wi_attach(); since sc_firmware_type is
not set yet this is a NOOP (noticed some time ago by fgs@). Call wi_cor_reset() from wi_watchdog() so we do a soft reset of the card. Currently, we only reset Symbol cards but should probably reset all but Lucent cards with very old firmware revisions.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/if_wi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index 43f57873903..f5debc609f4 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi.c,v 1.88 2002/10/27 16:20:48 millert Exp $ */
+/* $OpenBSD: if_wi.c,v 1.89 2003/01/10 21:38:02 millert Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -124,7 +124,7 @@ u_int32_t widebug = WIDEBUG;
#if !defined(lint) && !defined(__OpenBSD__)
static const char rcsid[] =
- "$OpenBSD: if_wi.c,v 1.88 2002/10/27 16:20:48 millert Exp $";
+ "$OpenBSD: if_wi.c,v 1.89 2003/01/10 21:38:02 millert Exp $";
#endif /* lint */
#ifdef foo
@@ -188,7 +188,6 @@ wi_attach(sc)
struct ifnet *ifp;
int error;
- wi_cor_reset(sc);
wi_reset(sc);
/* Read the station address. */
@@ -2365,6 +2364,7 @@ wi_watchdog(ifp)
printf(WI_PRT_FMT ": device timeout\n", WI_PRT_ARG(sc));
+ wi_cor_reset(sc);
wi_init(sc);
ifp->if_oerrors++;