[PATCH] b44 enable interrupts after tx timeout (2.6-test version)

Resending the patch I sent some time ago for b44.c that nukes the
2.4 compatibility cruft as well.

I'll do one for 2.4.23pre6 ASAP, hopefully being able sync the driver fully
with the one in 2.6 (free_netdev() etc.).

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index ef10d16fd679ed24e95adfd90ff131745653a86c..e87bb3ebb7db3cf70b8c88f3bfb24b5a94716124 100644 (file)
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -25,8 +25,8 @@
 
 #define DRV_MODULE_NAME                "b44"
 #define PFX DRV_MODULE_NAME    ": "
-#define DRV_MODULE_VERSION     "0.9"
-#define DRV_MODULE_RELDATE     "Jul 14, 2003"
+#define DRV_MODULE_VERSION     "0.91"
+#define DRV_MODULE_RELDATE     "Oct 3, 2003"
 
 #define B44_DEF_MSG_ENABLE       \
        (NETIF_MSG_DRV          | \
@@ -80,15 +80,6 @@ MODULE_PARM_DESC(b44_debug, "B44 bitmapped debugging message enable value");
 
 static int b44_debug = -1;     /* -1 == use B44_DEF_MSG_ENABLE as value */
 
-#ifndef PCI_DEVICE_ID_BCM4401
-#define PCI_DEVICE_ID_BCM4401      0x4401
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#define IRQ_RETVAL(x) 
-#define irqreturn_t void
-#endif
-
 static struct pci_device_id b44_pci_tbl[] = {
        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BCM4401,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
@@ -870,6 +861,8 @@ static void b44_tx_timeout(struct net_device *dev)
 
        spin_unlock_irq(&bp->lock);
 
+       b44_enable_ints(bp);
+
        netif_wake_queue(dev);
 }