[PATCH] forcedeth: Poll for link changes

This is a multi-part message in MIME format.

1 files changed, 13 insertions, 12 deletions

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 6db6ce3e7bdb..b471d1a8ffdc 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -82,7 +82,8 @@
  *      0.31: 14 Nov 2004: ethtool support for getting/setting link
  *                         capabilities.
  *      0.32: 16 Apr 2005: RX_ERROR4 handling added.
- *      0.33: 16 Mai 2005: Support for MCP51 added.
+ *      0.33: 16 May 2005: Support for MCP51 added.
+ *      0.34: 18 Jun 2005: Add DEV_NEED_LINKTIMER to all nForce nics.
  *
  * Known bugs:
  * We suspect that on some hardware no TX done interrupts are generated.
@@ -94,7 +95,7 @@
  * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few
  * superfluous timer interrupts from the nic.
  */
-#define FORCEDETH_VERSION               "0.33"
+#define FORCEDETH_VERSION               "0.34"
 #define DRV_NAME                        "forcedeth"
 
 #include <linux/module.h>
@@ -2218,70 +2219,70 @@ static struct pci_device_id pci_tbl[] = {
                 .device = PCI_DEVICE_ID_NVIDIA_NVENET_4,
                 .subvendor = PCI_ANY_ID,
                 .subdevice = PCI_ANY_ID,
-                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
         },
         {       /* nForce3 Ethernet Controller */
                 .vendor = PCI_VENDOR_ID_NVIDIA,
                 .device = PCI_DEVICE_ID_NVIDIA_NVENET_5,
                 .subvendor = PCI_ANY_ID,
                 .subdevice = PCI_ANY_ID,
-                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
         },
         {       /* nForce3 Ethernet Controller */
                 .vendor = PCI_VENDOR_ID_NVIDIA,
                 .device = PCI_DEVICE_ID_NVIDIA_NVENET_6,
                 .subvendor = PCI_ANY_ID,
                 .subdevice = PCI_ANY_ID,
-                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
         },
         {       /* nForce3 Ethernet Controller */
                 .vendor = PCI_VENDOR_ID_NVIDIA,
                 .device = PCI_DEVICE_ID_NVIDIA_NVENET_7,
                 .subvendor = PCI_ANY_ID,
                 .subdevice = PCI_ANY_ID,
-                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
         },
         {       /* CK804 Ethernet Controller */
                 .vendor = PCI_VENDOR_ID_NVIDIA,
                 .device = PCI_DEVICE_ID_NVIDIA_NVENET_8,
                 .subvendor = PCI_ANY_ID,
                 .subdevice = PCI_ANY_ID,
-                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
         },
         {       /* CK804 Ethernet Controller */
                 .vendor = PCI_VENDOR_ID_NVIDIA,
                 .device = PCI_DEVICE_ID_NVIDIA_NVENET_9,
                 .subvendor = PCI_ANY_ID,
                 .subdevice = PCI_ANY_ID,
-                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
         },
         {       /* MCP04 Ethernet Controller */
                 .vendor = PCI_VENDOR_ID_NVIDIA,
                 .device = PCI_DEVICE_ID_NVIDIA_NVENET_10,
                 .subvendor = PCI_ANY_ID,
                 .subdevice = PCI_ANY_ID,
-                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
         },
         {       /* MCP04 Ethernet Controller */
                 .vendor = PCI_VENDOR_ID_NVIDIA,
                 .device = PCI_DEVICE_ID_NVIDIA_NVENET_11,
                 .subvendor = PCI_ANY_ID,
                 .subdevice = PCI_ANY_ID,
-                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
         },
         {       /* MCP51 Ethernet Controller */
                 .vendor = PCI_VENDOR_ID_NVIDIA,
                 .device = PCI_DEVICE_ID_NVIDIA_NVENET_12,
                 .subvendor = PCI_ANY_ID,
                 .subdevice = PCI_ANY_ID,
-                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
         },
         {       /* MCP51 Ethernet Controller */
                 .vendor = PCI_VENDOR_ID_NVIDIA,
                 .device = PCI_DEVICE_ID_NVIDIA_NVENET_13,
                 .subvendor = PCI_ANY_ID,
                 .subdevice = PCI_ANY_ID,
-                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ,
+                .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
         },
         {0,},
 };