From d698ba2e8d825e69446b19475c947cba2ab48d6d Mon Sep 17 00:00:00 2001
From: Shreyas Bhatewara <sbhatewara@vmware.com>
Date: Mon, 19 Jul 2010 07:02:13 +0000
Subject: [PATCH] --- yaml --- r: 203631 b: refs/heads/master c:
 d9a5f210c5ef338295cf1c29d98825722351bed7 h: refs/heads/master i:   203629:
 8d27c9367504166b697e8b4bdcc0c28b7924952d   203627:
 b93b8084a31a4656cacfd4c88f1a88a077bba511   203623:
 7e5f6c669cae70a57e7dd6f16e89724ecf872247   203615:
 656159f5cb24671af38ea246334c0e64b3def5f2 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8488fc765629..97419d611bf1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd27290a593f80cb99e95287cb29c72c0d57608b
+refs/heads/master: d9a5f210c5ef338295cf1c29d98825722351bed7
diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
index 57d3850cca8d..3b55fbd1294d 100644
--- a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/trunk/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);
 }