diff options
author | Auke Kok <auke-jan.h.kok@intel.com> | 2006-05-23 13:29:58 -0400 |
---|---|---|
committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-05-23 13:29:58 -0400 |
commit | 940829e2f9d89d3caddc852bca9018cf503ea719 (patch) | |
tree | aae6a6f8c3bcc80a54fae135634958e2f4b6c6cb | |
parent | f017f14b3f18b38f2388e7d6e83a7f6997ee9dd6 (diff) |
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>
-rw-r--r-- | drivers/net/ixgb/ixgb_hw.h | 1 | ||||
-rw-r--r-- | drivers/net/ixgb/ixgb_ids.h | 4 | ||||
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 7 |
3 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ixgb/ixgb_hw.h index 382c6300ccc2..19513c6c2f15 100644 --- a/drivers/net/ixgb/ixgb_hw.h +++ b/drivers/net/ixgb/ixgb_hw.h | |||
@@ -57,6 +57,7 @@ typedef enum { | |||
57 | typedef enum { | 57 | typedef enum { |
58 | ixgb_media_type_unknown = 0, | 58 | ixgb_media_type_unknown = 0, |
59 | ixgb_media_type_fiber = 1, | 59 | ixgb_media_type_fiber = 1, |
60 | ixgb_media_type_copper = 2, | ||
60 | ixgb_num_media_types | 61 | ixgb_num_media_types |
61 | } ixgb_media_type; | 62 | } ixgb_media_type; |
62 | 63 | ||
diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ixgb/ixgb_ids.h index aee207eaa287..e119c05a6f2d 100644 --- a/drivers/net/ixgb/ixgb_ids.h +++ b/drivers/net/ixgb/ixgb_ids.h | |||
@@ -43,6 +43,8 @@ | |||
43 | #define IXGB_SUBDEVICE_ID_A11F 0xA11F | 43 | #define IXGB_SUBDEVICE_ID_A11F 0xA11F |
44 | #define IXGB_SUBDEVICE_ID_A01F 0xA01F | 44 | #define IXGB_SUBDEVICE_ID_A01F 0xA01F |
45 | 45 | ||
46 | #endif /* #ifndef _IXGB_IDS_H_ */ | 46 | #define IXGB_DEVICE_ID_82597EX_CX4 0x109E |
47 | #define IXGB_SUBDEVICE_ID_A00C 0xA00C | ||
47 | 48 | ||
49 | #endif /* #ifndef _IXGB_IDS_H_ */ | ||
48 | /* End of File */ | 50 | /* End of File */ |
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index 466cbe208ef2..0de3ed08ff56 100644 --- 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."; | |||
67 | static struct pci_device_id ixgb_pci_tbl[] = { | 67 | static struct pci_device_id ixgb_pci_tbl[] = { |
68 | {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX, | 68 | {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX, |
69 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 69 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
70 | {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_CX4, | ||
71 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | ||
70 | {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR, | 72 | {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR, |
71 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 73 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
72 | {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR, | 74 | {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR, |
@@ -565,8 +567,9 @@ ixgb_sw_init(struct ixgb_adapter *adapter) | |||
565 | hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH; | 567 | hw->max_frame_size = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH; |
566 | 568 | ||
567 | if((hw->device_id == IXGB_DEVICE_ID_82597EX) | 569 | if((hw->device_id == IXGB_DEVICE_ID_82597EX) |
568 | ||(hw->device_id == IXGB_DEVICE_ID_82597EX_LR) | 570 | || (hw->device_id == IXGB_DEVICE_ID_82597EX_CX4) |
569 | ||(hw->device_id == IXGB_DEVICE_ID_82597EX_SR)) | 571 | || (hw->device_id == IXGB_DEVICE_ID_82597EX_LR) |
572 | || (hw->device_id == IXGB_DEVICE_ID_82597EX_SR)) | ||
570 | hw->mac_type = ixgb_82597; | 573 | hw->mac_type = ixgb_82597; |
571 | else { | 574 | else { |
572 | /* should never have loaded on this device */ | 575 | /* should never have loaded on this device */ |