---

yaml --- r: 183421 b: refs/heads/master c: c36531b h: refs/heads/master i: 183419: d400919 v: v3
git-mirror · Jan 7, 2010 · c509022 · c509022
1 parent ff9cba6
commit c509022
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: c32bbff81c04096c7888aed3946ee90fdbfbc3a3
+refs/heads/master: c36531b9b2e00d9715c3a0f5788ac5311435e078
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -3176,7 +3176,9 @@ static void sky2_reset(struct sky2_hw *hw)
 static void sky2_detach(struct net_device *dev)
 {
 	if (netif_running(dev)) {
+		netif_tx_lock(dev);
 		netif_device_detach(dev);	/* stop txq */
+		netif_tx_unlock(dev);
 		sky2_down(dev);
 	}
 }