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

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

details:   https://anonhg.NetBSD.org/src/rev/72727757a2d8
branches:  netbsd-7
changeset: 800043:72727757a2d8
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Dec 09 05:27:30 2016 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1300):
        sys/dev/pci/pcidevs: revision 1.1270
        sys/dev/pci/if_wm.c: revision 1.426
i82567V-3 is not ICH9 but ICH8.
--
82567V-3 is not ICH9 but ICH8.

diffstat:

 sys/dev/pci/if_wm.c |  10 +++++-----
 sys/dev/pci/pcidevs |   4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r 0f928aed6da2 -r 72727757a2d8 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Fri Dec 09 05:23:58 2016 +0000
+++ b/sys/dev/pci/if_wm.c       Fri Dec 09 05:27:30 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.289.2.9 2016/02/26 22:08:17 snj Exp $      */
+/*     $NetBSD: if_wm.c,v 1.289.2.10 2016/12/09 05:27:30 snj 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.9 2016/02/26 22:08:17 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.10 2016/12/09 05:27:30 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1029,6 +1029,9 @@
        { PCI_VENDOR_INTEL,     PCI_PRODUCT_INTEL_82801H_IFE_G,
          "Intel i82801H IFE (G) LAN Controller",
          WM_T_ICH8,            WMP_F_COPPER },
+       { PCI_VENDOR_INTEL,     PCI_PRODUCT_INTEL_82801H_82567V_3,
+         "82567V-3 LAN Controller",
+         WM_T_ICH8,            WMP_F_COPPER },
        { PCI_VENDOR_INTEL,     PCI_PRODUCT_INTEL_82801I_IGP_AMT,
          "82801I (AMT) LAN Controller",
          WM_T_ICH9,            WMP_F_COPPER },
@@ -1056,9 +1059,6 @@
        { PCI_VENDOR_INTEL,     PCI_PRODUCT_INTEL_82801I_BM,
          "82567LM-4 LAN Controller",
          WM_T_ICH9,            WMP_F_COPPER },
-       { PCI_VENDOR_INTEL,     PCI_PRODUCT_INTEL_82801I_82567V_3,
-         "82567V-3 LAN Controller",
-         WM_T_ICH9,            WMP_F_COPPER },
        { PCI_VENDOR_INTEL,     PCI_PRODUCT_INTEL_82801J_R_BM_LM,
          "82567LM-2 LAN Controller",
          WM_T_ICH10,           WMP_F_COPPER },
diff -r 0f928aed6da2 -r 72727757a2d8 sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Fri Dec 09 05:23:58 2016 +0000
+++ b/sys/dev/pci/pcidevs       Fri Dec 09 05:27:30 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1199.2.8 2016/12/09 05:15:18 snj Exp $
+$NetBSD: pcidevs,v 1.1199.2.9 2016/12/09 05:27:30 snj Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2968,7 +2968,7 @@
 product INTEL 82870P2_PPB      0x1460  82870P2 P64H2 PCI-PCI Bridge
 product INTEL 82870P2_IOxAPIC  0x1461  82870P2 P64H2 IOxAPIC
 product INTEL 82870P2_HPLUG    0x1462  82870P2 P64H2 Hot Plug Controller
-product INTEL 82801I_82567V_3  0x1501  i82567V-3 LAN Controller
+product INTEL 82801H_82567V_3  0x1501  i82567V-3 LAN Controller
 product INTEL PCH2_LV_LM       0x1502  82579LM Gigabit Network Connection
 product INTEL PCH2_LV_V                0x1503  82579V Gigabit Network Connection
 product INTEL 82599_SFP_EM     0x1507  82599 10G Ethernet Express Module