ixgb: add copper 10gig driver id

Add support for Copper 10GbE device ID 109E

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>

diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ixgb/ixgb_hw.h
index 382c6300ccc23901bb073f4de7591f4354c5dfc7..19513c6c2f15e70b384622211a9945e3c367b261 100644 (file)
--- a/drivers/net/ixgb/ixgb_hw.h
+++ b/drivers/net/ixgb/ixgb_hw.h
@@ -57,6 +57,7 @@ typedef enum {
 typedef enum {
        ixgb_media_type_unknown = 0,
        ixgb_media_type_fiber = 1,
+       ixgb_media_type_copper = 2,
        ixgb_num_media_types
 } ixgb_media_type;
 

diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ixgb/ixgb_ids.h
index aee207eaa287e3eaf79fa50f76d72dfc3ceebb68..e119c05a6f2d19b1bff6c11913ddf01f9bb5c06c 100644 (file)
--- a/drivers/net/ixgb/ixgb_ids.h
+++ b/drivers/net/ixgb/ixgb_ids.h
@@ -43,6 +43,8 @@
 #define IXGB_SUBDEVICE_ID_A11F      0xA11F   
 #define IXGB_SUBDEVICE_ID_A01F      0xA01F   
 
-#endif /* #ifndef _IXGB_IDS_H_ */
+#define IXGB_DEVICE_ID_82597EX_CX4   0x109E
+#define IXGB_SUBDEVICE_ID_A00C  0xA00C
 
+#endif /* #ifndef _IXGB_IDS_H_ */
 /* End of File */

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 466cbe208ef26b0e77df4a47c259923c747a70d7..0de3ed08ff56eff08f788e8c46cf912cc27ca47d 100644 (file)
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -67,6 +67,8 @@ static char ixgb_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";
 static struct pci_device_id ixgb_pci_tbl[] = {
        {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX,
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_CX4,
+        PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR,
         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR,  
@@ -565,8 +567,9 @@ ixgb_sw_init(struct ixgb_adapter *adapter)
        hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;
 
        if((hw->device_id == IXGB_DEVICE_ID_82597EX)
-          ||(hw->device_id == IXGB_DEVICE_ID_82597EX_LR)
-          ||(hw->device_id == IXGB_DEVICE_ID_82597EX_SR))
+          || (hw->device_id == IXGB_DEVICE_ID_82597EX_CX4)
+          || (hw->device_id == IXGB_DEVICE_ID_82597EX_LR)
+          || (hw->device_id == IXGB_DEVICE_ID_82597EX_SR))
                        hw->mac_type = ixgb_82597;
        else {
                /* should never have loaded on this device */