Merge branch 'upstream-fixes'

[safe/jmp/linux-2.6] / drivers / net / b44.c

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index ac223fc..c3267e4 100644 (file)
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -18,7 +18,6 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/version.h>
 #include <linux/dma-mapping.h>
 
 #include <asm/uaccess.h>
@@ -29,8 +28,8 @@
 
 #define DRV_MODULE_NAME                "b44"
 #define PFX DRV_MODULE_NAME    ": "
-#define DRV_MODULE_VERSION     "0.95"
-#define DRV_MODULE_RELDATE     "Aug 3, 2004"
+#define DRV_MODULE_VERSION     "0.97"
+#define DRV_MODULE_RELDATE     "Nov 30, 2005"
 
 #define B44_DEF_MSG_ENABLE       \
        (NETIF_MSG_DRV          | \
@@ -895,11 +894,10 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
        struct net_device *dev = dev_id;
        struct b44 *bp = netdev_priv(dev);
-       unsigned long flags;
        u32 istat, imask;
        int handled = 0;
 
-       spin_lock_irqsave(&bp->lock, flags);
+       spin_lock(&bp->lock);
 
        istat = br32(bp, B44_ISTAT);
        imask = br32(bp, B44_IMASK);
@@ -910,6 +908,12 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        istat &= imask;
        if (istat) {
                handled = 1;
+
+               if (unlikely(!netif_running(dev))) {
+                       printk(KERN_INFO "%s: late interrupt.\n", dev->name);
+                       goto irq_ack;
+               }
+
                if (netif_rx_schedule_prep(dev)) {
                        /* NOTE: These writes are posted by the readback of
                         *       the ISTAT register below.
@@ -922,10 +926,11 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                               dev->name);
                }
 
+irq_ack:
                bw32(bp, B44_ISTAT, istat);
                br32(bp, B44_ISTAT);
        }
-       spin_unlock_irqrestore(&bp->lock, flags);
+       spin_unlock(&bp->lock);
        return IRQ_RETVAL(handled);
 }
 
@@ -1389,22 +1394,20 @@ static int b44_open(struct net_device *dev)
 
        err = b44_alloc_consistent(bp);
        if (err)
-               return err;
-
-       err = request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev);
-       if (err)
-               goto err_out_free;
-
-       spin_lock_irq(&bp->lock);
+               goto out;
 
        b44_init_rings(bp);
        b44_init_hw(bp);
-       bp->flags |= B44_FLAG_INIT_COMPLETE;
 
-       netif_carrier_off(dev);
        b44_check_phy(bp);
 
-       spin_unlock_irq(&bp->lock);
+       err = request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev);
+       if (unlikely(err < 0)) {
+               b44_chip_reset(bp);
+               b44_free_rings(bp);
+               b44_free_consistent(bp);
+               goto out;
+       }
 
        init_timer(&bp->timer);
        bp->timer.expires = jiffies + HZ;
@@ -1413,11 +1416,8 @@ static int b44_open(struct net_device *dev)
        add_timer(&bp->timer);
 
        b44_enable_ints(bp);
-
-       return 0;
-
-err_out_free:
-       b44_free_consistent(bp);
+       netif_start_queue(dev);
+out:
        return err;
 }
 
@@ -1452,6 +1452,8 @@ static int b44_close(struct net_device *dev)
 
        netif_stop_queue(dev);
 
+       netif_poll_disable(dev);
+
        del_timer_sync(&bp->timer);
 
        spin_lock_irq(&bp->lock);
@@ -1461,13 +1463,14 @@ static int b44_close(struct net_device *dev)
 #endif
        b44_halt(bp);
        b44_free_rings(bp);
-       bp->flags &= ~B44_FLAG_INIT_COMPLETE;
-       netif_carrier_off(bp->dev);
+       netif_carrier_off(dev);
 
        spin_unlock_irq(&bp->lock);
 
        free_irq(dev->irq, dev);
 
+       netif_poll_enable(dev);
+
        b44_free_consistent(bp);
 
        return 0;
@@ -1613,7 +1616,7 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct b44 *bp = netdev_priv(dev);
 
-       if (!(bp->flags & B44_FLAG_INIT_COMPLETE))
+       if (!netif_running(dev))
                return -EAGAIN;
        cmd->supported = (SUPPORTED_Autoneg);
        cmd->supported |= (SUPPORTED_100baseT_Half |
@@ -1651,7 +1654,7 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        struct b44 *bp = netdev_priv(dev);
 
-       if (!(bp->flags & B44_FLAG_INIT_COMPLETE))
+       if (!netif_running(dev))
                return -EAGAIN;
 
        /* We do not support gigabit. */
@@ -1834,12 +1837,15 @@ static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
        struct mii_ioctl_data *data = if_mii(ifr);
        struct b44 *bp = netdev_priv(dev);
-       int err;
+       int err = -EINVAL;
+
+       if (!netif_running(dev))
+               goto out;
 
        spin_lock_irq(&bp->lock);
        err = generic_mii_ioctl(&bp->mii_if, data, cmd, NULL);
        spin_unlock_irq(&bp->lock);
-
+out:
        return err;
 }
 
@@ -1993,6 +1999,8 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
        dev->irq = pdev->irq;
        SET_ETHTOOL_OPS(dev, &b44_ethtool_ops);
 
+       netif_carrier_off(dev);
+
        err = b44_get_invariants(bp);
        if (err) {
                printk(KERN_ERR PFX "Problem fetching invariants of chip, "
@@ -2110,6 +2118,7 @@ static int b44_resume(struct pci_dev *pdev)
        add_timer(&bp->timer);
 
        b44_enable_ints(bp);
+       netif_wake_queue(dev);
        return 0;
 }
 
@@ -2128,7 +2137,7 @@ static int __init b44_init(void)
 
        /* Setup paramaters for syncing RX/TX DMA descriptors */
        dma_desc_align_mask = ~(dma_desc_align_size - 1);
-       dma_desc_sync_size = max(dma_desc_align_size, sizeof(struct dma_desc));
+       dma_desc_sync_size = max_t(unsigned int, dma_desc_align_size, sizeof(struct dma_desc));
 
        return pci_module_init(&b44_driver);
 }