---

yaml --- r: 109241 b: refs/heads/master c: 8e0b1bf h: refs/heads/master i: 109239: e4283f8 v: v3
git-mirror · Aug 24, 2008 · 9f92474 · 9f92474
1 parent 01f145c
commit 9f92474
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92c70f27d2a78873c940e77c7f075cd8e2e60a2d
+refs/heads/master: 8e0b1bf6ac6c4c6dd985e586cd765aede4678bba
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
@@ -634,9 +634,9 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
 				txq_reclaim(mp->txq + i, 0);
 
 		if (netif_carrier_ok(mp->dev)) {
-			spin_lock(&mp->lock);
+			spin_lock_irq(&mp->lock);
 			__txq_maybe_wake(mp->txq + mp->txq_primary);
-			spin_unlock(&mp->lock);
+			spin_unlock_irq(&mp->lock);
 		}
 	}
 #endif