net-next: vmxnet3 fixes [4/5] Do not reset when the device is not opened

[net-next-2.6.git] / drivers / net / vmxnet3 / vmxnet3_drv.c

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 989b742551ac4e44a2c6775c7c65cb1a796d3ba5..3b55fbd1294d8526cde05c19ecc0d1dc0c33b9a3 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -72,6 +72,8 @@ vmxnet3_enable_all_intrs(struct vmxnet3_adapter *adapter)
 
        for (i = 0; i < adapter->intr.num_intrs; i++)
                vmxnet3_enable_intr(adapter, i);
+       adapter->shared->devRead.intrConf.intrCtrl &=
+                                       cpu_to_le32(~VMXNET3_IC_DISABLE_ALL);
 }
 
 
@@ -80,6 +82,8 @@ vmxnet3_disable_all_intrs(struct vmxnet3_adapter *adapter)
 {
        int i;
 
+       adapter->shared->devRead.intrConf.intrCtrl |=
+                                       cpu_to_le32(VMXNET3_IC_DISABLE_ALL);
        for (i = 0; i < adapter->intr.num_intrs; i++)
                vmxnet3_disable_intr(adapter, i);
 }
@@ -128,7 +132,7 @@ vmxnet3_tq_stop(struct vmxnet3_tx_queue *tq, struct vmxnet3_adapter *adapter)
  * Check the link state. This may start or stop the tx queue.
  */
 static void
-vmxnet3_check_link(struct vmxnet3_adapter *adapter)
+vmxnet3_check_link(struct vmxnet3_adapter *adapter, bool affectTxQueue)
 {
        u32 ret;
 
@@ -141,14 +145,16 @@ vmxnet3_check_link(struct vmxnet3_adapter *adapter)
                if (!netif_carrier_ok(adapter->netdev))
                        netif_carrier_on(adapter->netdev);
 
-               vmxnet3_tq_start(&adapter->tx_queue, adapter);
+               if (affectTxQueue)
+                       vmxnet3_tq_start(&adapter->tx_queue, adapter);
        } else {
                printk(KERN_INFO "%s: NIC Link is Down\n",
                       adapter->netdev->name);
                if (netif_carrier_ok(adapter->netdev))
                        netif_carrier_off(adapter->netdev);
 
-               vmxnet3_tq_stop(&adapter->tx_queue, adapter);
+               if (affectTxQueue)
+                       vmxnet3_tq_stop(&adapter->tx_queue, adapter);
        }
 }
 
@@ -163,7 +169,7 @@ vmxnet3_process_events(struct vmxnet3_adapter *adapter)
 
        /* Check if link state has changed */
        if (events & VMXNET3_ECR_LINK)
-               vmxnet3_check_link(adapter);
+               vmxnet3_check_link(adapter, true);
 
        /* Check if there is an error on xmit/recv queues */
        if (events & (VMXNET3_ECR_TQERR | VMXNET3_ECR_RQERR)) {
@@ -1825,6 +1831,7 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
                devRead->intrConf.modLevels[i] = adapter->intr.mod_levels[i];
 
        devRead->intrConf.eventIntrIdx = adapter->intr.event_intr_idx;
+       devRead->intrConf.intrCtrl |= cpu_to_le32(VMXNET3_IC_DISABLE_ALL);
 
        /* rx filter settings */
        devRead->rxFilterConf.rxMode = 0;
@@ -1889,7 +1896,7 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
         * Check link state when first activating device. It will start the
         * tx queue if the link is up.
         */
-       vmxnet3_check_link(adapter);
+       vmxnet3_check_link(adapter, true);
 
        napi_enable(&adapter->napi);
        vmxnet3_enable_all_intrs(adapter);
@@ -2358,6 +2365,7 @@ vmxnet3_reset_work(struct work_struct *data)
                return;
 
        /* if the device is closed, we must leave it alone */
+       rtnl_lock();
        if (netif_running(adapter->netdev)) {
                printk(KERN_INFO "%s: resetting\n", adapter->netdev->name);
                vmxnet3_quiesce_dev(adapter);
@@ -2366,6 +2374,7 @@ vmxnet3_reset_work(struct work_struct *data)
        } else {
                printk(KERN_INFO "%s: already closed\n", adapter->netdev->name);
        }
+       rtnl_unlock();
 
        clear_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state);
 }
@@ -2491,6 +2500,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
        }
 
        set_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state);
+       vmxnet3_check_link(adapter, false);
        atomic_inc(&devices_found);
        return 0;