diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-11-03 06:39:11 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-11-03 06:39:11 +0000 |
| commit | 09be75b4ef332b2082dc4987381233cd58b5bb7b (patch) | |
| tree | 699bc751428dd68152333704bf87727d4f7c7fa1 | |
| parent | 69c37080f4b07f4b3fa6308f17ff5052b7728977 (diff) | |
the 8257E KCS PCI id is not the MAC but an IPMI interface being provided
from the chipset, so remove it.
| -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, 3 insertions, 6 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 6cb3735ffbd..d6dfc7082bb 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.151 2006/10/30 08:34:14 dlg Exp $ */ +/* $OpenBSD: if_em.c,v 1.152 2006/11/03 06:39:10 brad Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -104,7 +104,6 @@ const struct pci_matchid em_devices[] = { { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82572EI }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573E }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573E_IAMT }, - { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573E_KCS }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573E_PM }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573L }, { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573L_PL_1 }, diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c index dffc002dfdd..8757f82cdd4 100644 --- a/sys/dev/pci/if_em_hw.c +++ b/sys/dev/pci/if_em_hw.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ -/* $OpenBSD: if_em_hw.c,v 1.22 2006/08/09 04:44:06 brad Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.23 2006/11/03 06:39:10 brad Exp $ */ /* if_em_hw.c * Shared functions for accessing and configuring the MAC @@ -379,7 +379,6 @@ em_set_mac_type(struct em_hw *hw) break; case E1000_DEV_ID_82573E: case E1000_DEV_ID_82573E_IAMT: - case E1000_DEV_ID_82573E_KCS: case E1000_DEV_ID_82573E_PM: case E1000_DEV_ID_82573L: case E1000_DEV_ID_82573L_PL_1: diff --git a/sys/dev/pci/if_em_hw.h b/sys/dev/pci/if_em_hw.h index eb4346675f2..228da9f038e 100644 --- a/sys/dev/pci/if_em_hw.h +++ b/sys/dev/pci/if_em_hw.h @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ -/* $OpenBSD: if_em_hw.h,v 1.18 2006/08/09 04:44:06 brad Exp $ */ +/* $OpenBSD: if_em_hw.h,v 1.19 2006/11/03 06:39:10 brad Exp $ */ /* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */ /* if_em_hw.h @@ -545,7 +545,6 @@ int32_t em_ife_enable_dynamic_power_down(struct em_hw *hw); #define E1000_DEV_ID_82572EI 0x10B9 #define E1000_DEV_ID_82573E 0x108B #define E1000_DEV_ID_82573E_IAMT 0x108C -#define E1000_DEV_ID_82573E_KCS 0x108E #define E1000_DEV_ID_82573L 0x109A #define E1000_DEV_ID_82546GB_2 0x109B #define E1000_DEV_ID_82571EB_AT 0x10A0 |