From c5090223777bf826fd9e281531b920dceb8b72d7 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mikem@ring3k.org>
Date: Thu, 31 Dec 2009 00:55:31 +0000
Subject: [PATCH] --- yaml --- r: 183421 b: refs/heads/master c:
 c36531b9b2e00d9715c3a0f5788ac5311435e078 h: refs/heads/master i:   183419:
 d400919a858a8c907ae88b9c8041b8d4a32c1b97 v: v3

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

diff --git a/[refs] b/[refs]
index 6fd3d8229a65..ce891d87782e 100644
--- 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
index faa48410195e..8ae8520baaf3 100644
--- 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);
 	}
 }