Module Name: src
Committed By: snj
Date: Fri Dec 9 05:27:30 UTC 2016
Modified Files:
src/sys/dev/pci [netbsd-7]: if_wm.c pcidevs
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.289.2.9 -r1.289.2.10 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.1199.2.8 -r1.1199.2.9 src/sys/dev/pci/pcidevs
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.289.2.9 src/sys/dev/pci/if_wm.c:1.289.2.10
--- src/sys/dev/pci/if_wm.c:1.289.2.9 Fri Feb 26 22:08:17 2016
+++ src/sys/dev/pci/if_wm.c Fri Dec 9 05:27:30 2016
@@ -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 @@ static const struct wm_product {
{ 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 @@ static const struct wm_product {
{ 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 },
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1199.2.8 src/sys/dev/pci/pcidevs:1.1199.2.9
--- src/sys/dev/pci/pcidevs:1.1199.2.8 Fri Dec 9 05:15:18 2016
+++ src/sys/dev/pci/pcidevs Fri Dec 9 05:27:30 2016
@@ -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 82439HX 0x1250 82439HX (T
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
