From 9f9247439e5d81a02f4dcef49f12317bc059f559 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Sun, 24 Aug 2008 02:30:42 +0200
Subject: [PATCH] --- yaml --- r: 109241 b: refs/heads/master c:
 8e0b1bf6ac6c4c6dd985e586cd765aede4678bba h: refs/heads/master i:   109239:
 e4283f82796138953f5871d72db5ecb97dadde91 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/mv643xx_eth.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e37dd4c6eda6..48a23fb2ebf0 100644
--- 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
index 8a91d79383dd..30e6d4b8d564 100644
--- 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