---

yaml --- r: 107316 b: refs/heads/master c: 4dfc1c8 h: refs/heads/master v: v3
git-mirror · Jul 24, 2008 · 23ab921 · 23ab921
1 parent 9ac8243
commit 23ab921
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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