[PATCH] ixgb Intel 10GE driver

From: Phil Sorber
Date: Mon Nov 22 2004 - 17:04:55 EST

This is a patch against 2.6.8.1 that enables the ixgb driver to be used for LR cards as well. I have attatched a file and pasted it into this email.

------------------------------SNIP--------------------------------

diff -uNr linux-2.6.8.1/drivers/net/ixgb/ixgb_hw.c linux-2.6.8.1-fix/drivers/net/ixgb/ixgb_hw.c
--- linux-2.6.8.1/drivers/net/ixgb/ixgb_hw.c 2004-08-14 06:55:47.000000000 -0400
+++ linux-2.6.8.1-fix/drivers/net/ixgb/ixgb_hw.c 2004-11-22 11:43:12.680602928 -0500
@@ -198,6 +198,7 @@
break;

case IXGB_DEVICE_ID_82597EX_SR:
+ case IXGB_DEVICE_ID_82597EX_LR:
/* The SR adapters carry two different types of XPAK optics
* modules; read the vendor identifier to determine the exact
* type of optics. */
diff -uNr linux-2.6.8.1/drivers/net/ixgb/ixgb_ids.h linux-2.6.8.1-fix/drivers/net/ixgb/ixgb_ids.h
--- linux-2.6.8.1/drivers/net/ixgb/ixgb_ids.h 2004-08-14 06:55:32.000000000 -0400
+++ linux-2.6.8.1-fix/drivers/net/ixgb/ixgb_ids.h 2004-11-22 11:42:46.460588976 -0500
@@ -38,6 +38,7 @@

#define IXGB_DEVICE_ID_82597EX 0x1048
#define IXGB_DEVICE_ID_82597EX_SR 0x1A48
+#define IXGB_DEVICE_ID_82597EX_LR 0x1B48

#define IXGB_SUBDEVICE_ID_A11F 0xA11F
#define IXGB_SUBDEVICE_ID_A01F 0xA01F
diff -uNr linux-2.6.8.1/drivers/net/ixgb/ixgb_main.c linux-2.6.8.1-fix/drivers/net/ixgb/ixgb_main.c
--- linux-2.6.8.1/drivers/net/ixgb/ixgb_main.c 2004-08-14 06:54:51.000000000 -0400
+++ linux-2.6.8.1-fix/drivers/net/ixgb/ixgb_main.c 2004-11-22 11:42:57.173960296 -0500
@@ -46,6 +46,8 @@
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,}
@@ -484,7 +486,8 @@
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->device_id == IXGB_DEVICE_ID_82597EX_SR)
+ || (hw->device_id == IXGB_DEVICE_ID_82597EX_LR))
hw->mac_type = ixgb_82597;
else {
/* should never have loaded on this device */

----------------------------SNIP------------------------------

--
Phil Sorber 814.863.9447
/.../its/aset/gears/hpc/phil 214E Computer Building

diff -uNr linux-2.6.8.1/drivers/net/ixgb/ixgb_hw.c linux-2.6.8.1-fix/drivers/net/ixgb/ixgb_hw.c
--- linux-2.6.8.1/drivers/net/ixgb/ixgb_hw.c 2004-08-14 06:55:47.000000000 -0400
+++ linux-2.6.8.1-fix/drivers/net/ixgb/ixgb_hw.c 2004-11-22 11:43:12.680602928 -0500
@@ -198,6 +198,7 @@
break;

case IXGB_DEVICE_ID_82597EX_SR:
+ case IXGB_DEVICE_ID_82597EX_LR:
/* The SR adapters carry two different types of XPAK optics
* modules; read the vendor identifier to determine the exact
* type of optics. */
diff -uNr linux-2.6.8.1/drivers/net/ixgb/ixgb_ids.h linux-2.6.8.1-fix/drivers/net/ixgb/ixgb_ids.h
--- linux-2.6.8.1/drivers/net/ixgb/ixgb_ids.h 2004-08-14 06:55:32.000000000 -0400
+++ linux-2.6.8.1-fix/drivers/net/ixgb/ixgb_ids.h 2004-11-22 11:42:46.460588976 -0500
@@ -38,6 +38,7 @@

#define IXGB_DEVICE_ID_82597EX 0x1048
#define IXGB_DEVICE_ID_82597EX_SR 0x1A48
+#define IXGB_DEVICE_ID_82597EX_LR 0x1B48

#define IXGB_SUBDEVICE_ID_A11F 0xA11F
#define IXGB_SUBDEVICE_ID_A01F 0xA01F
diff -uNr linux-2.6.8.1/drivers/net/ixgb/ixgb_main.c linux-2.6.8.1-fix/drivers/net/ixgb/ixgb_main.c
--- linux-2.6.8.1/drivers/net/ixgb/ixgb_main.c 2004-08-14 06:54:51.000000000 -0400
+++ linux-2.6.8.1-fix/drivers/net/ixgb/ixgb_main.c 2004-11-22 11:42:57.173960296 -0500
@@ -46,6 +46,8 @@
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,}
@@ -484,7 +486,8 @@
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->device_id == IXGB_DEVICE_ID_82597EX_SR)
+ || (hw->device_id == IXGB_DEVICE_ID_82597EX_LR))
hw->mac_type = ixgb_82597;
else {
/* should never have loaded on this device */

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature