[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/48f058283c25
branches:  netbsd-6
changeset: 775592:48f058283c25
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Dec 17 00:30:05 2012 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #755):
        sys/dev/pci/if_wm.c: revision 1.239
- 82578DC is not PCH2 but PCH. 82579V is not PCH but PCH2. This bug was
   introduced in rev. 1.221. Reported by FUKAUMI Naoki.
- Fix comment.

diffstat:

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

diffs (43 lines):

diff -r c640005912ec -r 48f058283c25 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Mon Dec 17 00:28:13 2012 +0000
+++ b/sys/dev/pci/if_wm.c       Mon Dec 17 00:30:05 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.227.2.4 2012/11/23 16:35:21 riz Exp $      */
+/*     $NetBSD: if_wm.c,v 1.227.2.5 2012/12/17 00:30:05 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.4 2012/11/23 16:35:21 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.227.2.5 2012/12/17 00:30:05 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -931,13 +931,13 @@
          WM_T_PCH,             WMP_F_1000T },
        { PCI_VENDOR_INTEL,     PCI_PRODUCT_INTEL_PCH_D_DC,
          "PCH LAN (82578DC) Controller",
-         WM_T_PCH2,            WMP_F_1000T },
+         WM_T_PCH,             WMP_F_1000T },
        { PCI_VENDOR_INTEL,     PCI_PRODUCT_INTEL_PCH2_LV_LM,
          "PCH2 LAN (82579LM) Controller",
          WM_T_PCH2,            WMP_F_1000T },
        { PCI_VENDOR_INTEL,     PCI_PRODUCT_INTEL_PCH2_LV_V,
          "PCH2 LAN (82579V) Controller",
-         WM_T_PCH,             WMP_F_1000T },
+         WM_T_PCH2,            WMP_F_1000T },
        { PCI_VENDOR_INTEL,     PCI_PRODUCT_INTEL_82575EB_COPPER,
          "82575EB dual-1000baseT Ethernet",
          WM_T_82575,           WMP_F_1000T },
@@ -4125,7 +4125,7 @@
                if (wm_check_reset_block(sc) == 0) {
                        /*
                         * Gate automatic PHY configuration by hardware on
-                        * manaed 82579
+                        * non-managed 82579
                         */
                        if ((sc->sc_type == WM_T_PCH2)
                            && ((CSR_READ(sc, WMREG_FWSM) & FWSM_FW_VALID)