lkml.org 
[lkml]   [2010]   [Jul]   [13]   [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-next: vmxnet3 fixes [4/5] Do not reset when the device is not opened

    Do not reset when the device is not opened

    If a reset is scheduled, and the device goes thru close and open, it
    may happen that reset and open may run in parallel.
    The reset code now bails out if the device is not opened.

    Signed-off-by: Ronghua Zang <ronghua@vmware.com>
    Signed-off-by: Matthieu Bucchianeri <matthieu@vmware.com>
    Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>

    ---

    drivers/net/vmxnet3/vmxnet3_drv.c | 5 +++--
    1 files changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
    index 1e31d40..ffd6a9b 100644
    --- a/drivers/net/vmxnet3/vmxnet3_drv.c
    +++ b/drivers/net/vmxnet3/vmxnet3_drv.c
    @@ -2417,8 +2417,9 @@ vmxnet3_reset_work(struct work_struct *data)
    if (test_and_set_bit(VMXNET3_STATE_BIT_RESETTING, &adapter->state))
    return;

    - /* if the device is closed, we must leave it alone */
    - if (netif_running(adapter->netdev)) {
    + /* if the device is closed or is being opened, we must leave it alone */
    + if (netif_running(adapter->netdev) &&
    + (adapter->netdev->flags & IFF_UP)) {
    printk(KERN_INFO "%s: resetting\n", adapter->netdev->name);
    vmxnet3_quiesce_dev(adapter);
    vmxnet3_reset_dev(adapter);

    \
     
     \ /
      Last update: 2010-07-14 02:53    [W:0.023 / U:0.400 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site