From: Matt Mackall <mpm@selenic.com>
Date: Fri, 12 Aug 2005 02:24:33 +0000 (-0700)
Subject: [NETPOLL]: e1000 netpoll tweak
X-Git-Tag: v2.6.13-rc7~98^2~5
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6b0b31572985c2e64f7216c798766302fb782281;p=linux-2.6-omap-h63xx.git

[NETPOLL]: e1000 netpoll tweak

Suggested by Steven Rostedt, matches his patch included in e100.

Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 5e5d2c3c7ce..b82fd15d089 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3789,6 +3789,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);
 	enable_irq(adapter->pdev->irq);
 }
 #endif