summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2004-10-27 21:14:04 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2004-10-27 21:14:04 +0000
commitbd216bdbb681eb55a3ff4b742dfdc100591f48a3 (patch)
tree6ecf6d344332532c6479c7fe94b1dc3eb120d17f
parent688c93c6764d7ea637cf953bd169b4a7e0c7c422 (diff)
Reduce timeout from two seconds to one second for command ack and from five
seconds to one second for firmware notification.
-rw-r--r--sys/dev/pci/if_ipw.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 3525a017aa8..d60ab5a6f9a 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/* $Id: if_ipw.c,v 1.3 2004/10/27 21:12:08 damien Exp $ */
+/* $Id: if_ipw.c,v 1.4 2004/10/27 21:14:03 damien Exp $ */
/*-
* Copyright (c) 2004
@@ -669,8 +669,8 @@ ipw_cmd(struct ipw_softc *sc, u_int32_t type, void *data, u_int32_t len)
DPRINTFN(2, ("TX!CMD!%u!%u!%u!%u\n", type, 0, 0, len));
- /* Wait at most two seconds for command to complete */
- return tsleep(sc->cmd, 0, "ipwcmd", 2 * hz);
+ /* Wait at most one second for command to complete */
+ return tsleep(sc->cmd, 0, "ipwcmd", hz);
}
int
@@ -1641,8 +1641,8 @@ ipw_firmware_init(struct ipw_softc *sc, u_char *data)
/* Tell the adapter to initialize the firmware */
CSR_WRITE_4(sc, IPW_CSR_RST, 0);
- /* Wait at most 5 seconds for firmware initialization to complete */
- if ((error = tsleep(sc, 0, "ipwinit", 5 * hz)) != 0) {
+ /* Wait at most one second for firmware initialization to complete */
+ if ((error = tsleep(sc, 0, "ipwinit", hz)) != 0) {
printf("%s: timeout waiting for firmware initialization to "
"complete\n", sc->sc_dev.dv_xname);
goto fail3;