diff --git a/[refs] b/[refs] index 038d9a052d5e..47b11c006920 100644 --- 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 index d9bb51bb4b9d..c921ec32c232 100644 --- 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); } }