Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

net-next: vmxnet3 fixes [3/5] Initialize link state at probe time

Browse Source 
This change initializes the state of link at the time when driver is
loaded. The ethtool output for 'link detected' and 'link speed'
is thus valid even before the interface is brought up.

Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Shreyas Bhatewara 2010-07-15 21:51:14 +00:00 committed by David S. Miller
parent 36227e88c2
commit 4a1745fc54
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/vmxnet3/vmxnet3_drv.c
View File

@ -132,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. * Check the link state. This may start or stop the tx queue.
*/ */
static void static void
vmxnet3_check_link(struct vmxnet3_adapter *adapter) vmxnet3_check_link(struct vmxnet3_adapter *adapter, bool affectTxQueue)
{ {
u32 ret; u32 ret;
@ -145,14 +145,16 @@ vmxnet3_check_link(struct vmxnet3_adapter *adapter)
if (!netif_carrier_ok(adapter->netdev)) if (!netif_carrier_ok(adapter->netdev))
netif_carrier_on(adapter->netdev); netif_carrier_on(adapter->netdev);
vmxnet3_tq_start(&adapter->tx_queue, adapter); if (affectTxQueue)
vmxnet3_tq_start(&adapter->tx_queue, adapter);
} else { } else {
printk(KERN_INFO "%s: NIC Link is Down\n", printk(KERN_INFO "%s: NIC Link is Down\n",
adapter->netdev->name); adapter->netdev->name);
if (netif_carrier_ok(adapter->netdev)) if (netif_carrier_ok(adapter->netdev))
netif_carrier_off(adapter->netdev); netif_carrier_off(adapter->netdev);
vmxnet3_tq_stop(&adapter->tx_queue, adapter); if (affectTxQueue)
vmxnet3_tq_stop(&adapter->tx_queue, adapter);
} }
} }
@ -167,7 +169,7 @@ vmxnet3_process_events(struct vmxnet3_adapter *adapter)
/* Check if link state has changed */ /* Check if link state has changed */
if (events & VMXNET3_ECR_LINK) if (events & VMXNET3_ECR_LINK)
vmxnet3_check_link(adapter); vmxnet3_check_link(adapter, true);
/* Check if there is an error on xmit/recv queues */ /* Check if there is an error on xmit/recv queues */
if (events & (VMXNET3_ECR_TQERR | VMXNET3_ECR_RQERR)) { if (events & (VMXNET3_ECR_TQERR | VMXNET3_ECR_RQERR)) {
@ -1894,7 +1896,7 @@ vmxnet3_activate_dev(struct vmxnet3_adapter *adapter)
* Check link state when first activating device. It will start the * Check link state when first activating device. It will start the
* tx queue if the link is up. * tx queue if the link is up.
*/ */
vmxnet3_check_link(adapter); vmxnet3_check_link(adapter, true);
napi_enable(&adapter->napi); napi_enable(&adapter->napi);
vmxnet3_enable_all_intrs(adapter); vmxnet3_enable_all_intrs(adapter);
@ -2496,6 +2498,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
} }
set_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state); set_bit(VMXNET3_STATE_BIT_QUIESCED, &adapter->state);
vmxnet3_check_link(adapter, false);
atomic_inc(&devices_found); atomic_inc(&devices_found);
return 0; return 0;