From 23ab921e2cb6ef5ab234ab593f20050a94007ffb Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Tue, 15 Jul 2008 13:34:51 +0200
Subject: [PATCH] --- yaml --- r: 107316 b: refs/heads/master c:
 4dfc1c87af46f9d8abf2ef78a4e22891d7a564c3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f95dcf1958ea..ebcfba986e75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b368f6859c80343e5d7c6e2a7c49df0a8a273c1
+refs/heads/master: 4dfc1c87af46f9d8abf2ef78a4e22891d7a564c3
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index d7620c50efb1..3211369a4320 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/drivers/net/mv643xx_eth.c
@@ -626,6 +626,12 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
 		for (i = 0; i < 8; i++)
 			if (mp->txq_mask & (1 << i))
 				txq_reclaim(mp->txq + i, 0);
+
+		if (netif_carrier_ok(mp->dev)) {
+			spin_lock(&mp->lock);
+			__txq_maybe_wake(mp->txq + mp->txq_primary);
+			spin_unlock(&mp->lock);
+		}
 	}
 #endif