diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2006-01-13 01:51:14 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 13:48:03 +0100 |
| commit | e8da8be146e6043fb4b60a222be0014a0fb46d24 (patch) | |
| tree | 7d0a184d6a1f02ad770e53034281cd15516cc46b /drivers | |
| parent | [PATCH] e1000: Fixed frame size logic (diff) | |
| download | linux-e8da8be146e6043fb4b60a222be0014a0fb46d24.tar.xz linux-e8da8be146e6043fb4b60a222be0014a0fb46d24.zip | |
[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')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 3 |
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) 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 |