Module Name: src
Committed By: msaitoh
Date: Mon Apr 23 01:29:23 UTC 2018
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Count timeout correctly. This change reduce timeout value for 80003 as
expected. Reported by mouse@.
To generate a diff of this commit:
cvs rdiff -u -r1.574 -r1.575 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.574 src/sys/dev/pci/if_wm.c:1.575
--- src/sys/dev/pci/if_wm.c:1.574 Fri Apr 20 03:03:13 2018
+++ src/sys/dev/pci/if_wm.c Mon Apr 23 01:29:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.574 2018/04/20 03:03:13 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.575 2018/04/23 01:29:23 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.574 2018/04/20 03:03:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.575 2018/04/23 01:29:23 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -13069,7 +13069,7 @@ wm_get_swfw_semaphore(struct wm_softc *s
else
timeout = 200;
- for (timeout = 0; timeout < 200; timeout++) {
+ while (timeout) {
if (wm_get_swsm_semaphore(sc)) {
aprint_error_dev(sc->sc_dev,
"%s: failed to get semaphore\n",
@@ -13085,6 +13085,7 @@ wm_get_swfw_semaphore(struct wm_softc *s
}
wm_put_swsm_semaphore(sc);
delay(5000);
+ timeout--;
}
printf("%s: failed to get swfw semaphore mask 0x%x swfw 0x%x\n",
device_xname(sc->sc_dev), mask, swfw_sync);
