summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_em.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/pci/if_em.c')
-rw-r--r--sys/dev/pci/if_em.c53
1 files changed, 27 insertions, 26 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index 4a1c2df75ed..b987afd3449 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.46 2004/09/29 18:28:28 mlaier Exp $ */
-/* $OpenBSD: if_em.c,v 1.52 2005/05/27 20:36:35 brad Exp $ */
+/* $OpenBSD: if_em.c,v 1.53 2005/05/29 07:54:26 brad Exp $ */
#include "bpfilter.h"
#include "vlan.h"
@@ -99,40 +99,41 @@ char em_driver_version[] = "1.7.35";
* PCI Device ID Table
*********************************************************************/
const struct pci_matchid em_devices[] = {
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82542 },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_SC },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_SC },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_LOM },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB },
- { 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_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_MOB },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_QUAD },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LOM },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LP },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER_LOM },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MOBILE },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI_LF },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI_MOBILE },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82542 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_FIBER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_FIBER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_LOM },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_FIBER },
{ 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_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 },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_1000_GT }
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_QUAD_COPPER },
+ { 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_82546GB_PCIE },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_QUAD_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_MOBILE },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547GI },
};
/*********************************************************************