From 49e6a21711417c2ba02a9f6e452f009752a97f93 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 15 Oct 2005 00:32:29 -0700
Subject: [PATCH] --- yaml --- r: 10345 b: refs/heads/master c:
 c4cfe567b92d5663f98e2f82f28ffc3069fc982f h: refs/heads/master i:   10343:
 bc9ef677502a8cc2cb5e8a03876d244c72a1235a v: v3

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

diff --git a/[refs] b/[refs]
index da4d63d85349..68cf60bab25f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2aa1d82db7a967b748c4b41854c4222cd0484114
+refs/heads/master: c4cfe567b92d5663f98e2f82f28ffc3069fc982f
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index 18847f9e4d49..40128b9d16ef 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -4347,7 +4347,7 @@ e1000_netpoll(struct net_device *netdev)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	disable_irq(adapter->pdev->irq);
 	e1000_intr(adapter->pdev->irq, netdev, NULL);
-	e1000_clean_tx_irq(adapter);
+	e1000_clean_tx_irq(adapter, adapter->tx_ring);
 	enable_irq(adapter->pdev->irq);
 }
 #endif