Module Name: src
Committed By: msaitoh
Date: Wed Jun 19 10:53:24 UTC 2013
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix a bug that wrong semaphore is used in wm_gmii_hv_{read,write}reg.
To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 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.257 src/sys/dev/pci/if_wm.c:1.258
--- src/sys/dev/pci/if_wm.c:1.257 Wed Jun 19 10:38:51 2013
+++ src/sys/dev/pci/if_wm.c Wed Jun 19 10:53:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.257 2013/06/19 10:38:51 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.258 2013/06/19 10:53:24 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.257 2013/06/19 10:38:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.258 2013/06/19 10:53:24 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -7023,7 +7023,7 @@ wm_gmii_hv_readreg(device_t self, int ph
uint16_t val;
int rv;
- if (wm_get_swfw_semaphore(sc, SWFW_PHY0_SM)) {
+ if (wm_get_swfwhw_semaphore(sc)) {
aprint_error_dev(sc->sc_dev, "%s: failed to get semaphore\n",
__func__);
return 0;
@@ -7055,7 +7055,7 @@ wm_gmii_hv_readreg(device_t self, int ph
}
rv = wm_gmii_i82544_readreg(self, phy, regnum & IGPHY_MAXREGADDR);
- wm_put_swfw_semaphore(sc, SWFW_PHY0_SM);
+ wm_put_swfwhw_semaphore(sc);
return rv;
}
@@ -7073,7 +7073,7 @@ wm_gmii_hv_writereg(device_t self, int p
uint16_t page = BM_PHY_REG_PAGE(reg);
uint16_t regnum = BM_PHY_REG_NUM(reg);
- if (wm_get_swfw_semaphore(sc, SWFW_PHY0_SM)) {
+ if (wm_get_swfwhw_semaphore(sc)) {
aprint_error_dev(sc->sc_dev, "%s: failed to get semaphore\n",
__func__);
return;
@@ -7110,7 +7110,7 @@ wm_gmii_hv_writereg(device_t self, int p
}
wm_gmii_i82544_writereg(self, phy, regnum & IGPHY_MAXREGADDR, val);
- wm_put_swfw_semaphore(sc, SWFW_PHY0_SM);
+ wm_put_swfwhw_semaphore(sc);
}
/*
