Module Name: src
Committed By: martin
Date: Wed Nov 28 16:26:31 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-7]: if_wm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1656):
sys/dev/pci/if_wm.c: revision 1.599
- Fix a bug that i82578 PHY can't detect correctly.
- Print PHY OUI and model number if a PHY's can't be identified.
XXX pullup-[78]
To generate a diff of this commit:
cvs rdiff -u -r1.289.2.17 -r1.289.2.18 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.289.2.17 src/sys/dev/pci/if_wm.c:1.289.2.18
--- src/sys/dev/pci/if_wm.c:1.289.2.17 Fri Nov 9 11:28:39 2018
+++ src/sys/dev/pci/if_wm.c Wed Nov 28 16:26:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.289.2.17 2018/11/09 11:28:39 sborrill Exp $ */
+/* $NetBSD: if_wm.c,v 1.289.2.18 2018/11/28 16:26:31 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.17 2018/11/09 11:28:39 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.18 2018/11/28 16:26:31 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -7300,7 +7300,7 @@ wm_gmii_setup_phytype(struct wm_softc *s
} else {
/* It's not the first call. Use PHY OUI and model */
switch (phy_oui) {
- case MII_OUI_ATHEROS: /* XXX ??? */
+ case MII_OUI_ATTANSIC: /* XXX ??? */
switch (phy_model) {
case 0x0004: /* XXX */
new_phytype = WMPHY_82578;
@@ -7377,8 +7377,9 @@ wm_gmii_setup_phytype(struct wm_softc *s
break;
}
if (new_phytype == WMPHY_UNKNOWN)
- aprint_verbose_dev(dev, "%s: unknown PHY model\n",
- __func__);
+ aprint_verbose_dev(dev,
+ "%s: unknown PHY model. OUI=%06x, model=%04x\n",
+ __func__, phy_oui, phy_model);
if ((sc->sc_phytype != WMPHY_UNKNOWN)
&& (sc->sc_phytype != new_phytype )) {
