diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-03-10 03:08:35 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-03-10 03:08:35 +0000 |
| commit | 7c75918ee55e1ec431d99752d6e8167983c06bd8 (patch) | |
| tree | a4e810ad6de877f92ebc87a987ae8f91c5f26028 | |
| parent | 751dd9296e1519fc70ce822692c880a7df856bb1 (diff) | |
match on more i217/i218 variants
| -rw-r--r-- | sys/dev/pci/if_em.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_em_hw.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_em_hw.h | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index a06977b0771..3bcf72c54ac 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.277 2014/02/22 04:41:31 chris Exp $ */ +/* $OpenBSD: if_em.c,v 1.278 2014/03/10 03:08:34 jsg Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -140,7 +140,11 @@ const struct pci_matchid em_devices[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I217_LM }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I217_V }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_LM }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_LM_2 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_LM_3 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_V }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_V_2 }, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_V_3 }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_COPPER }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_FIBER }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_SERDES }, diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c index f11de823fa0..99dab188122 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.77 2014/02/22 04:41:31 chris Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.78 2014/03/10 03:08:34 jsg Exp $ */ /* * if_em_hw.c Shared functions for accessing and configuring the MAC */ @@ -592,6 +592,10 @@ em_set_mac_type(struct em_hw *hw) case E1000_DEV_ID_PCH_LPT_I217_V: case E1000_DEV_ID_PCH_LPTLP_I218_LM: case E1000_DEV_ID_PCH_LPTLP_I218_V: + case E1000_DEV_ID_PCH_I218_LM2: + case E1000_DEV_ID_PCH_I218_V2: + case E1000_DEV_ID_PCH_I218_LM3: + case E1000_DEV_ID_PCH_I218_V3: hw->mac_type = em_pch_lpt; break; case E1000_DEV_ID_EP80579_LAN_1: diff --git a/sys/dev/pci/if_em_hw.h b/sys/dev/pci/if_em_hw.h index 65655220e99..4634dc52d92 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.58 2014/02/22 04:41:32 chris Exp $ */ +/* $OpenBSD: if_em_hw.h,v 1.59 2014/03/10 03:08:34 jsg Exp $ */ /* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */ /* if_em_hw.h @@ -547,6 +547,10 @@ int32_t em_check_phy_reset_block(struct em_hw *hw); #define E1000_DEV_ID_PCH_LPT_I217_V 0x153B #define E1000_DEV_ID_PCH_LPTLP_I218_LM 0x155A #define E1000_DEV_ID_PCH_LPTLP_I218_V 0x1559 +#define E1000_DEV_ID_PCH_I218_LM2 0x15A0 +#define E1000_DEV_ID_PCH_I218_V2 0x15A1 +#define E1000_DEV_ID_PCH_I218_LM3 0x15A2 +#define E1000_DEV_ID_PCH_I218_V3 0x15A3 #define E1000_DEV_ID_82575EB_PT 0x10A7 #define E1000_DEV_ID_82575EB_PF 0x10A9 #define E1000_DEV_ID_82575GB_QP 0x10D6 |