---

yaml --- r: 150747 b: refs/heads/master c: ef681ce h: refs/heads/master i: 150745: cee2074 150743: 5f42265 v: v3
git-mirror · Jun 8, 2009 · aea4e88 · aea4e88
1 parent 7ee04a9
commit aea4e88
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d0ebfe7c9621d43804e9ce9f2b898541a7d9652
+refs/heads/master: ef681ce1e8b3e63317cd724c200b2fd39286c005
diff --git a/trunk/drivers/net/e100.c b/trunk/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. */