[src/trunk]: src/sys/dev/pci Fix a bug that PHY isn't set to low-power mode o...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1af69f64b6e8
branches:  trunk
changeset: 782575:1af69f64b6e8
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Nov 07 08:17:18 2012 +0000

description:
Fix a bug that PHY isn't set to low-power mode on PCH and PCH2.

diffstat:

 sys/dev/pci/if_wm.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5cbc662d35ec -r 1af69f64b6e8 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Wed Nov 07 07:24:46 2012 +0000
+++ b/sys/dev/pci/if_wm.c       Wed Nov 07 08:17:18 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.236 2012/10/12 11:24:44 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.237 2012/11/07 08:17:18 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.236 2012/10/12 11:24:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.237 2012/11/07 08:17:18 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -4372,7 +4372,7 @@
 
        reg = CSR_READ(sc, WMREG_CTRL_EXT);
        /* Enable PHY low-power state when MAC is at D3 w/o WoL */
-       if ((sc->sc_type == WM_T_PCH) && (sc->sc_type == WM_T_PCH2))
+       if ((sc->sc_type == WM_T_PCH) || (sc->sc_type == WM_T_PCH2))
                CSR_WRITE(sc, WMREG_CTRL_EXT, reg | CTRL_EXT_PHYPDEN);
 
        /* Initialize the transmit descriptor ring. */