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 57d3850cca8ddb7c8b318b5cee332427be6aa41d..3b55fbd1294d8526cde05c19ecc0d1dc0c33b9a3 100644 (file)
--- 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);
 }