From 50a738642508e10ab8f9ae6b9923c2e14e5fd966 Mon Sep 17 00:00:00 2001
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 12 Jan 2006 16:51:14 -0800
Subject: [PATCH] --- yaml --- r: 18813 b: refs/heads/master c:
 e8da8be146e6043fb4b60a222be0014a0fb46d24 h: refs/heads/master i:   18811:
 85d6ba349b00119f073a38617cc200ec0451cc30 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/e1000/e1000_main.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6af723dbf622..7069ccc88656 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce7393b93502f52e2ef7259e9e9bc3b1a1fd6799
+refs/heads/master: e8da8be146e6043fb4b60a222be0014a0fb46d24
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index 8190eb00d54f..6d7f9c9df085 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -4449,6 +4449,9 @@ e1000_netpoll(struct net_device *netdev)
 	disable_irq(adapter->pdev->irq);
 	e1000_intr(adapter->pdev->irq, netdev, NULL);
 	e1000_clean_tx_irq(adapter, adapter->tx_ring);
+#ifndef CONFIG_E1000_NAPI
+	adapter->clean_rx(adapter, adapter->rx_ring);
+#endif
 	enable_irq(adapter->pdev->irq);
 }
 #endif