aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2006-01-12 19:51:14 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-01-17 07:48:03 -0500
commite8da8be146e6043fb4b60a222be0014a0fb46d24 (patch)
tree7d0a184d6a1f02ad770e53034281cd15516cc46b /drivers/net
parentce7393b93502f52e2ef7259e9e9bc3b1a1fd6799 (diff)
[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 <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/e1000/e1000_main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 8190eb00d54f..6d7f9c9df085 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)
4449 disable_irq(adapter->pdev->irq); 4449 disable_irq(adapter->pdev->irq);
4450 e1000_intr(adapter->pdev->irq, netdev, NULL); 4450 e1000_intr(adapter->pdev->irq, netdev, NULL);
4451 e1000_clean_tx_irq(adapter, adapter->tx_ring); 4451 e1000_clean_tx_irq(adapter, adapter->tx_ring);
4452#ifndef CONFIG_E1000_NAPI
4453 adapter->clean_rx(adapter, adapter->rx_ring);
4454#endif
4452 enable_irq(adapter->pdev->irq); 4455 enable_irq(adapter->pdev->irq);
4453} 4456}
4454#endif 4457#endif