---

yaml --- r: 65139 b: refs/heads/master c: d78ae2d h: refs/heads/master i: 65137: a55436e 65135: 2c57177 v: v3
git-mirror · Sep 19, 2007 · 2280e48 · 2280e48
1 parent e652e37
commit 2280e48
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65d916d95314566f426cc40ff0f17b754a773b0b
+refs/heads/master: d78ae2dcc2acebb9a1048278f47f762c069db75c
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
@@ -2570,6 +2570,15 @@ static void rtl8169_tx_interrupt(struct net_device *dev,
 		    (TX_BUFFS_AVAIL(tp) >= MAX_SKB_FRAGS)) {
 			netif_wake_queue(dev);
 		}
+		/*
+		 * 8168 hack: TxPoll requests are lost when the Tx packets are
+		 * too close. Let's kick an extra TxPoll request when a burst
+		 * of start_xmit activity is detected (if it is not detected,
+		 * it is slow enough). -- FR
+		 */
+		smp_rmb();
+		if (tp->cur_tx != dirty_tx)
+			RTL_W8(TxPoll, NPQ);
 	}
 }