Module Name: src
Committed By: msaitoh
Date: Tue Jun 11 10:07:09 UTC 2013
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
The wm_linkintr_gmii() function is called from interrupt, so call
mii_pollstat() instead of mii_tick().
To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 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.253 src/sys/dev/pci/if_wm.c:1.254
--- src/sys/dev/pci/if_wm.c:1.253 Tue Jun 4 16:55:07 2013
+++ src/sys/dev/pci/if_wm.c Tue Jun 11 10:07:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.253 2013/06/04 16:55:07 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.254 2013/06/11 10:07:09 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.253 2013/06/04 16:55:07 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.254 2013/06/11 10:07:09 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -3820,9 +3820,9 @@ wm_linkintr_gmii(struct wm_softc *sc, ui
if (icr & ICR_LSC) {
DPRINTF(WM_DEBUG_LINK,
- ("%s: LINK: LSC -> mii_tick\n",
+ ("%s: LINK: LSC -> mii_pollstat\n",
device_xname(sc->sc_dev)));
- mii_tick(&sc->sc_mii);
+ mii_pollstat(&sc->sc_mii);
if (sc->sc_type == WM_T_82543) {
int miistatus, active;
