Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / drivers / net / e1000e / netdev.c

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 5b916b0..6025d5f 100644 (file)
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4311,7 +4311,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;