---

yaml --- r: 159299 b: refs/heads/master c: fbc663c h: refs/heads/master i: 159297: 14f2740 159295: 3a34d69 v: v3
git-mirror · Aug 2, 2009 · 58971d7 · 58971d7
1 parent 52f006b
commit 58971d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6a1f83b63e6999ee9374330ea2d7924e775aff7
+refs/heads/master: fbc663ceeb7a48481a3b0290040528fbfd207282
diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c
@@ -4076,6 +4076,11 @@ static pci_ers_result_t qlge_io_error_detected(struct pci_dev *pdev,
 	struct net_device *ndev = pci_get_drvdata(pdev);
 	struct ql_adapter *qdev = netdev_priv(ndev);
 
+	netif_device_detach(ndev);
+
+	if (state == pci_channel_io_perm_failure)
+		return PCI_ERS_RESULT_DISCONNECT;
+
 	if (netif_running(ndev))
 		ql_adapter_down(qdev);