---

yaml --- r: 203631 b: refs/heads/master c: d9a5f21 h: refs/heads/master i: 203629: 8d27c93 203627: b93b808 203623: 7e5f6c6 203615: 656159f v: v3
git-mirror · Jul 19, 2010 · d698ba2 · d698ba2
1 parent 304987a
commit d698ba2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);
 }