Rogier Wolff a écrit :
On Wed, Jan 11, 2006 at 02:43:49PM +0100, Erik Mouw wrote:
The system only recovers after the Netdev watchdog found out that the
transmit timed out. However, the e1000 register dump starts about 4 to
5 seconds earlier: a possible workaround would be to trigger the
timeout code path as soon as the register dump starts.
Found a typo.
Roger.
--- e1000_main.c.orig 2006-01-11 14:53:23.000000000 +0100
+++ e1000_main.c 2006-01-11 14:53:38.000000000 +0100
@@ -3449,7 +3449,7 @@
}
for (i = 0; i < E1000_MAX_INTR; i++)
- if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
+ if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &&
!e1000_clean_tx_irq(adapter, adapter->tx_ring)))
break;
I believe it's not a typo.
The intention is to call both clean_rx() and e1000_clean_tx_irq(), and break
of the loop if both said : There was no job pending.
Eric
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
