diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-03-10 02:49:24 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-03-10 02:49:24 +0000 |
| commit | 712452deab5097b13024333b5e0ec4092fd9e03e (patch) | |
| tree | b44a88640600664191374f402e4c845d1db0a2c8 /sys | |
| parent | 7aaf664970987216bd685c5b2849678c1d1f9229 (diff) | |
Add another ICH10 em(4). From John the.cheeze at gmail.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_em.c | 3 | ||||
| -rw-r--r-- | sys/dev/pci/if_em_hw.c | 3 | ||||
| -rw-r--r-- | sys/dev/pci/if_em_hw.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 985a464aaf9..01316230e39 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.336 2017/07/25 20:45:18 bluhm Exp $ */ +/* $OpenBSD: if_em.c,v 1.337 2018/03/10 02:49:23 jsg Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -191,6 +191,7 @@ const struct pci_matchid em_devices[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ICH9_IGP_M_V }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ICH10_D_BM_LF }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ICH10_D_BM_LM }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ICH10_D_BM_V }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ICH10_R_BM_LF }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ICH10_R_BM_LM }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_ICH10_R_BM_V }, diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c index bd94aca904b..4e9a607bd12 100644 --- a/sys/dev/pci/if_em_hw.c +++ b/sys/dev/pci/if_em_hw.c @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: if_em_hw.c,v 1.94 2017/08/12 16:40:54 sf Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.95 2018/03/10 02:49:23 jsg Exp $ */ /* * if_em_hw.c Shared functions for accessing and configuring the MAC */ @@ -590,6 +590,7 @@ em_set_mac_type(struct em_hw *hw) break; case E1000_DEV_ID_ICH10_D_BM_LF: case E1000_DEV_ID_ICH10_D_BM_LM: + case E1000_DEV_ID_ICH10_D_BM_V: hw->mac_type = em_ich10lan; break; case E1000_DEV_ID_PCH_M_HV_LC: diff --git a/sys/dev/pci/if_em_hw.h b/sys/dev/pci/if_em_hw.h index a897269abde..f4dcb4aaae2 100644 --- a/sys/dev/pci/if_em_hw.h +++ b/sys/dev/pci/if_em_hw.h @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: if_em_hw.h,v 1.70 2017/08/12 16:40:54 sf Exp $ */ +/* $OpenBSD: if_em_hw.h,v 1.71 2018/03/10 02:49:23 jsg Exp $ */ /* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */ /* if_em_hw.h @@ -541,6 +541,7 @@ int32_t em_check_phy_reset_block(struct em_hw *hw); #define E1000_DEV_ID_ICH10_R_BM_V 0x10CE #define E1000_DEV_ID_ICH10_D_BM_LM 0x10DE #define E1000_DEV_ID_ICH10_D_BM_LF 0x10DF +#define E1000_DEV_ID_ICH10_D_BM_V 0x1525 #define E1000_DEV_ID_PCH_M_HV_LM 0x10EA #define E1000_DEV_ID_PCH_M_HV_LC 0x10EB #define E1000_DEV_ID_PCH_D_HV_DM 0x10EF |