[src/netbsd-6]: src/sys/dev/pci Pull up following revision(s) (requested by m...

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

details:   https://anonhg.NetBSD.org/src/rev/3c4044307c00
branches:  netbsd-6
changeset: 775504:3c4044307c00
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Nov 23 16:35:21 2012 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #697):
        sys/dev/pci/if_wm.c: revision 1.237
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 2eed6d802135 -r 3c4044307c00 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Fri Nov 23 16:17:46 2012 +0000
+++ b/sys/dev/pci/if_wm.c       Fri Nov 23 16:35:21 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.227.2.3 2012/09/03 19:09:41 riz Exp $      */
+/*     $NetBSD: if_wm.c,v 1.227.2.4 2012/11/23 16:35:21 riz 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.227.2.3 2012/09/03 19:09:41 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.227.2.4 2012/11/23 16:35:21 riz 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. */