diff options
| author | Shreyas Bhatewara <sbhatewara@vmware.com> | 2010-07-19 07:02:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-19 13:15:50 -0700 |
| commit | d9a5f210c5ef338295cf1c29d98825722351bed7 (patch) | |
| tree | 35f218fb7fe18dca53152a4a13a482d1e1902f13 /drivers/net/vmxnet3 | |
| parent | bd27290a593f80cb99e95287cb29c72c0d57608b (diff) | |
| download | blackbird-op-linux-d9a5f210c5ef338295cf1c29d98825722351bed7.tar.gz blackbird-op-linux-d9a5f210c5ef338295cf1c29d98825722351bed7.zip | |
net-next: vmxnet3 fixes [4/5] Do not reset when the device is not opened
Hold rtnl_lock to get the right link state.
While asynchronously resetting the device, hold rtnl_lock to get the
right value from netif_running. If a reset is scheduled, and the device
goes thru close and open, it may happen that reset and open may run in
parallel. Holding rtnl_lock will avoid this.
Signed-off-by: Shreyas Bhatewara <sbhatewara@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vmxnet3')
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 57d3850cca8d..3b55fbd1294d 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -2365,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); @@ -2373,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); } |
