From: Jeff Kirsher Date: Fri, 13 Jan 2006 00:51:14 +0000 (-0800) Subject: [PATCH] e1000: Fix Netpoll issue X-Git-Tag: v2.6.16-rc2~366^2~27 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e8da8be146e6043fb4b60a222be0014a0fb46d24;p=linux-2.6-omap-h63xx.git [PATCH] e1000: Fix Netpoll issue Fixed an issue netpoll would error out during communication, generating the following error: --netdump[14973]: Got toomany timeouts in handshaking, ... Even after a kernel panic, netpoll requires two way communication to successfully transfer the crash log to the remote server. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 8190eb00d54..6d7f9c9df08 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/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