Module Name: src
Committed By: msaitoh
Date: Fri Apr 13 09:35:10 UTC 2018
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
I354 uses an external PHY, so don't use wm_set_eee_i350().
To generate a diff of this commit:
cvs rdiff -u -r1.571 -r1.572 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.571 src/sys/dev/pci/if_wm.c:1.572
--- src/sys/dev/pci/if_wm.c:1.571 Fri Apr 13 06:04:12 2018
+++ src/sys/dev/pci/if_wm.c Fri Apr 13 09:35:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.571 2018/04/13 06:04:12 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.572 2018/04/13 09:35:10 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.571 2018/04/13 06:04:12 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.572 2018/04/13 09:35:10 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -4763,7 +4763,12 @@ wm_reset(struct wm_softc *sc)
/* reload sc_ctrl */
sc->sc_ctrl = CSR_READ(sc, WMREG_CTRL);
- if ((sc->sc_type >= WM_T_I350) && (sc->sc_type <= WM_T_I211))
+ if (sc->sc_type == WM_T_I354) {
+#if 0
+ /* I354 uses an external PHY */
+ wm_set_eee_i354(sc);
+#endif
+ } else if ((sc->sc_type >= WM_T_I350) && (sc->sc_type <= WM_T_I211))
wm_set_eee_i350(sc);
/*
