From: Jesse Brandeburg Date: Wed, 2 Feb 2011 10:19:55 +0000 (+0000) Subject: e1000e: tx_timeout should not increment for non-hang events X-Git-Tag: v2.6.38-rc5~50^2~14^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=463342741222c79469303cdab8ce99c8bc2d80e8;p=profile%2Fivi%2Fkernel-x86-ivi.git e1000e: tx_timeout should not increment for non-hang events Currently the driver increments the tx_timeout counter (an error counter) when simply resetting the part with outstanding transmit work pending. This is an unnecessary count of an error, when all we should be doing is just resetting the part and discarding the transmits. With this change the only increment of tx_timeout is when the stack calls the watchdog reset function due to a true Tx timeout. Signed-off-by: Jesse Brandeburg Reviewed-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 1c18f26..3065870 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -4309,7 +4309,6 @@ link_up: * to get done, so reset controller to flush Tx. * (Do the reset outside of interrupt context). */ - adapter->tx_timeout_count++; schedule_work(&adapter->reset_task); /* return immediately since reset is imminent */ return;