summaryrefslogtreecommitdiffstats
path: root/drivers/net/e100.c
diff options
context:
space:
mode:
authorAndre Detsch <adetsch@br.ibm.com>2009-06-08 00:42:30 -0700
committerDavid S. Miller <davem@davemloft.net>2009-06-08 00:42:30 -0700
commitef681ce1e8b3e63317cd724c200b2fd39286c005 (patch)
tree95251ac5c80b2285fe6dc375e9f4ccbd3669c389 /drivers/net/e100.c
parent1d0ebfe7c9621d43804e9ce9f2b898541a7d9652 (diff)
downloadop-kernel-dev-ef681ce1e8b3e63317cd724c200b2fd39286c005.zip
op-kernel-dev-ef681ce1e8b3e63317cd724c200b2fd39286c005.tar.gz
e100: Fix napi_enable BUG_ON when recovering from EEH error
BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state)) was being hit during e100 EEH recovery. The problem source was a napi_enable call being made during e100_io_error_detected. Napi should remain disabled after e100_down, and only be reenabled when the interface is recovered. This patch also updates e100_io_error_detected in order to make it similar to the current versions of the error_detected callback in drivers such as e1000e and ixgbe. Signed-off-by: Andre Detsch <adetsch@br.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e100.c')
-rw-r--r--drivers/net/e100.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 0f9ee13..0c37dd9 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2822,12 +2822,13 @@ static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel
struct net_device *netdev = pci_get_drvdata(pdev);
struct nic *nic = netdev_priv(netdev);
- /* Similar to calling e100_down(), but avoids adapter I/O. */
- e100_close(netdev);
-
- /* Detach; put netif into a state similar to hotplug unplug. */
- napi_enable(&nic->napi);
netif_device_detach(netdev);
+
+ if (state == pci_channel_io_perm_failure)
+ return PCI_ERS_RESULT_DISCONNECT;
+
+ if (netif_running(netdev))
+ e100_down(nic);
pci_disable_device(pdev);
/* Request a slot reset. */
OpenPOWER on IntegriCloud