diff options
| author | Ganesh Venkatesan <ganesh.venkatesan@intel.com> | 2005-01-08 02:21:47 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-01-08 02:21:47 -0500 |
| commit | b91cc1b20a4038f8426ba5b04cfef75c76dad879 (patch) | |
| tree | 015b9f5b0f8ceb8d8faed9ee4351bf27a1fec81e /drivers | |
| parent | 5cd8b820ef39195a2f3d8184b4e6e795d0374bc8 (diff) | |
| download | history-b91cc1b20a4038f8426ba5b04cfef75c76dad879.tar.gz | |
[PATCH] ixgb: Add support for 10GbE LR device ID
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ixgb/ixgb_hw.c | 5 | ||||
| -rw-r--r-- | drivers/net/ixgb/ixgb_ids.h | 1 | ||||
| -rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 9 |
3 files changed, 12 insertions, 3 deletions
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c index b9998af78ddd3e..88601c6ced6fa4 100644 --- a/drivers/net/ixgb/ixgb_hw.c +++ b/drivers/net/ixgb/ixgb_hw.c @@ -210,6 +210,11 @@ static ixgb_phy_type ixgb_identify_phy(struct ixgb_hw *hw) phy_type = ixgb_phy_type_g6005; } break; + case IXGB_DEVICE_ID_82597EX_LR: + DEBUGOUT("Identified G6104 optics\n"); + phy_type = ixgb_phy_type_g6104; + break; + default: DEBUGOUT("Unknown physical layer module\n"); diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ixgb/ixgb_ids.h index ea04cee1259dfd..9169f49fde9e49 100644 --- a/drivers/net/ixgb/ixgb_ids.h +++ b/drivers/net/ixgb/ixgb_ids.h @@ -47,6 +47,7 @@ #define IXGB_SUBDEVICE_ID_A12F 0xA12F #define IXGB_SUBDEVICE_ID_A02F 0xA02F +#define IXGB_DEVICE_ID_82597EX_LR 0x1B48 #endif /* #ifndef _IXGB_IDS_H_ */ diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index 9231fe12a3a7e1..fb18298f3153fa 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c @@ -46,6 +46,8 @@ static struct pci_device_id ixgb_pci_tbl[] = { 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, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* required last entry */ {0,} @@ -532,9 +534,10 @@ static int __devinit 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_SR)) - hw->mac_type = ixgb_82597; + 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->mac_type = ixgb_82597; else { /* should never have loaded on this device */ printk(KERN_ERR "ixgb: unsupported device id\n"); |