summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenric Jungheim <henric@cvs.openbsd.org>2004-05-04 06:00:52 +0000
committerHenric Jungheim <henric@cvs.openbsd.org>2004-05-04 06:00:52 +0000
commit5226c221abaca7db42760a6b1cfb0744bfaa2827 (patch)
treeb2b1306cd8aa1a9d1e17cd5cd0baba9a97bf358e
parent477434a6e537c27f1d314f27b53778bd081032c5 (diff)
Sort out the various Intel Pro/1000 IDs.
From Marco Peereboom.
-rw-r--r--sys/dev/pci/if_em.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index 43c94480101..8ade126b4af 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
/*$FreeBSD: if_em.c,v 1.38 2004/03/17 17:50:31 njl Exp $*/
-/* $OpenBSD: if_em.c,v 1.20 2004/04/26 07:27:52 deraadt Exp $ */
+/* $OpenBSD: if_em.c,v 1.21 2004/05/04 06:00:51 henric Exp $ */
#include "bpfilter.h"
#include "vlan.h"
@@ -170,25 +170,25 @@ const struct pci_matchid em_devices[] = {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_SC },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_SC },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER2 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_NC },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM_LOM },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LOM },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EP },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_LOM },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_MOB },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_QUAD },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LP },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_FIBER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_SERDES },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547GI },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI_MOBILE },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_COPPER },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_FIBER },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_SERDES }
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_CT },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MT },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MOB },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MT2 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_FIBER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_SERDES }
};
#endif /* __OpenBSD__ */