Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / drivers / net / cxgb3 / cxgb3_main.c

diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 066fd5b09fda8fc61d36b8e08456ea96f5e135f6..f9eede0a4b865e4a2c19805559d1b6bd94ded1fd 100644 (file)
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -1286,7 +1286,7 @@ irq_err:
 /*
  * Release resources when all the ports and offloading have been stopped.
  */
-static void cxgb_down(struct adapter *adapter)
+static void cxgb_down(struct adapter *adapter, int on_wq)
 {
        t3_sge_stop(adapter);
        spin_lock_irq(&adapter->work_lock);     /* sync with PHY intr task */
@@ -1296,7 +1296,8 @@ static void cxgb_down(struct adapter *adapter)
        free_irq_resources(adapter);
        quiesce_rx(adapter);
        t3_sge_stop(adapter);
-       flush_workqueue(cxgb3_wq);      /* wait for external IRQ handler */
+       if (!on_wq)
+               flush_workqueue(cxgb3_wq);/* wait for external IRQ handler */
 }
 
 static void schedule_chk_task(struct adapter *adap)
@@ -1374,7 +1375,7 @@ static int offload_close(struct t3cdev *tdev)
        clear_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map);
 
        if (!adapter->open_device_map)
-               cxgb_down(adapter);
+               cxgb_down(adapter, 0);
 
        cxgb3_offload_deactivate(adapter);
        return 0;
@@ -1409,7 +1410,7 @@ static int cxgb_open(struct net_device *dev)
        return 0;
 }
 
-static int cxgb_close(struct net_device *dev)
+static int __cxgb_close(struct net_device *dev, int on_wq)
 {
        struct port_info *pi = netdev_priv(dev);
        struct adapter *adapter = pi->adapter;
@@ -1436,12 +1437,17 @@ static int cxgb_close(struct net_device *dev)
                cancel_delayed_work_sync(&adapter->adap_check_task);
 
        if (!adapter->open_device_map)
-               cxgb_down(adapter);
+               cxgb_down(adapter, on_wq);
 
        cxgb3_event_notify(&adapter->tdev, OFFLOAD_PORT_DOWN, pi->port_id);
        return 0;
 }
 
+static int cxgb_close(struct net_device *dev)
+{
+       return __cxgb_close(dev, 0);
+}
+
 static struct net_device_stats *cxgb_get_stats(struct net_device *dev)
 {
        struct port_info *pi = netdev_priv(dev);
@@ -2296,6 +2302,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
        case CHELSIO_GET_QSET_NUM:{
                struct ch_reg edata;
 
+               memset(&edata, 0, sizeof(struct ch_reg));
+
                edata.cmd = CHELSIO_GET_QSET_NUM;
                edata.val = pi->nqsets;
                if (copy_to_user(useraddr, &edata, sizeof(edata)))
@@ -2862,7 +2870,7 @@ void t3_os_link_fault_handler(struct adapter *adapter, int port_id)
        spin_unlock(&adapter->work_lock);
 }
 
-static int t3_adapter_error(struct adapter *adapter, int reset)
+static int t3_adapter_error(struct adapter *adapter, int reset, int on_wq)
 {
        int i, ret = 0;
 
@@ -2877,7 +2885,7 @@ static int t3_adapter_error(struct adapter *adapter, int reset)
                struct net_device *netdev = adapter->port[i];
 
                if (netif_running(netdev))
-                       cxgb_close(netdev);
+                       __cxgb_close(netdev, on_wq);
        }
 
        /* Stop SGE timers */
@@ -2948,7 +2956,7 @@ static void fatal_error_task(struct work_struct *work)
        int err = 0;
 
        rtnl_lock();
-       err = t3_adapter_error(adapter, 1);
+       err = t3_adapter_error(adapter, 1, 1);
        if (!err)
                err = t3_reenable_adapter(adapter);
        if (!err)
@@ -2998,7 +3006,7 @@ static pci_ers_result_t t3_io_error_detected(struct pci_dev *pdev,
        if (state == pci_channel_io_perm_failure)
                return PCI_ERS_RESULT_DISCONNECT;
 
-       ret = t3_adapter_error(adapter, 0);
+       ret = t3_adapter_error(adapter, 0, 0);
 
        /* Request a slot reset. */
        return PCI_ERS_RESULT_NEED_RESET;
@@ -3198,17 +3206,17 @@ static int __devinit init_one(struct pci_dev *pdev,
                }
        }
 
-       err = pci_request_regions(pdev, DRV_NAME);
+       err = pci_enable_device(pdev);
        if (err) {
-               /* Just info, some other driver may have claimed the device. */
-               dev_info(&pdev->dev, "cannot obtain PCI resources\n");
-               return err;
+               dev_err(&pdev->dev, "cannot enable PCI device\n");
+               goto out;
        }
 
-       err = pci_enable_device(pdev);
+       err = pci_request_regions(pdev, DRV_NAME);
        if (err) {
-               dev_err(&pdev->dev, "cannot enable PCI device\n");
-               goto out_release_regions;
+               /* Just info, some other driver may have claimed the device. */
+               dev_info(&pdev->dev, "cannot obtain PCI resources\n");
+               goto out_disable_device;
        }
 
        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
@@ -3217,11 +3225,11 @@ static int __devinit init_one(struct pci_dev *pdev,
                if (err) {
                        dev_err(&pdev->dev, "unable to obtain 64-bit DMA for "
                               "coherent allocations\n");
-                       goto out_disable_device;
+                       goto out_release_regions;
                }
        } else if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) {
                dev_err(&pdev->dev, "no usable DMA configuration\n");
-               goto out_disable_device;
+               goto out_release_regions;
        }
 
        pci_set_master(pdev);
@@ -3234,7 +3242,7 @@ static int __devinit init_one(struct pci_dev *pdev,
        adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
        if (!adapter) {
                err = -ENOMEM;
-               goto out_disable_device;
+               goto out_release_regions;
        }
 
        adapter->nofail_skb =
@@ -3370,11 +3378,12 @@ out_free_dev:
 out_free_adapter:
        kfree(adapter);
 
-out_disable_device:
-       pci_disable_device(pdev);
 out_release_regions:
        pci_release_regions(pdev);
+out_disable_device:
+       pci_disable_device(pdev);
        pci_set_drvdata(pdev, NULL);
+out:
        return err;
 }