lkml.org 
[lkml]   [2010]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2.6.35-rc1] net: vmxnet3 fixes [3/5] Initialize link state at probe time

    Author: Shreyas Bhatewara <sbhatewara@vmware.com>

    Initialize vmxnet3 link state at probe time

    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>

    ---

    diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
    index 29db294..31a838f 100644
    --- a/drivers/net/vmxnet3/vmxnet3_drv.c
    +++ b/drivers/net/vmxnet3/vmxnet3_drv.c
    @@ -130,7 +130,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;

    @@ -143,14 +143,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);
    }
    }

    @@ -165,7 +167,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)) {
    @@ -1947,7 +1949,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);
    @@ -2549,6 +2551,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;

    diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
    index 0ddfe3c..5c94afa 100644
    --- a/drivers/net/vmxnet3/vmxnet3_int.h
    +++ b/drivers/net/vmxnet3/vmxnet3_int.h
    @@ -68,10 +68,10 @@
    /*
    * Version numbers
    */
    -#define VMXNET3_DRIVER_VERSION_STRING "1.0.9.0-k"
    +#define VMXNET3_DRIVER_VERSION_STRING "1.0.10.0-k"

    /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */
    -#define VMXNET3_DRIVER_VERSION_NUM 0x01000900
    +#define VMXNET3_DRIVER_VERSION_NUM 0x01000A00


    /*

    \
     
     \ /
      Last update: 2010-07-07 11:31    [W:0.024 / U:0.028 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site