From e52fd26b156accf0817d10fb069bccee190f4d96 Mon Sep 17 00:00:00 2001
From: Andy Gospodarek <andy@greyhouse.net>
Date: Thu, 19 Jun 2008 17:19:12 -0400
Subject: [PATCH] --- yaml --- r: 103114 b: refs/heads/master c:
 b45f87681e2851f0c991a589989daa6a4a351565 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/e1000/e1000_main.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8451af2fe2b2..939b9675f783 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42bfd33ab7bce7d2abaa8bd968ae9ad0dc9a4771
+refs/heads/master: b45f87681e2851f0c991a589989daa6a4a351565
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index b0e2493085b0..311ca266bd77 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -5251,7 +5251,6 @@ e1000_netpoll(struct net_device *netdev)
 
 	disable_irq(adapter->pdev->irq);
 	e1000_intr(adapter->pdev->irq, netdev);
-	e1000_clean_tx_irq(adapter, adapter->tx_ring);
 #ifndef CONFIG_E1000_NAPI
 	adapter->clean_rx(adapter, adapter->rx_ring);
 #endif