---

yaml --- r: 154705 b: refs/heads/master c: 59ed6ee h: refs/heads/master i: 154703: 625eb32 v: v3
git-mirror · Jul 1, 2009 · e4f257e · e4f257e
1 parent 7c1c0c1
commit e4f257e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c93b5a76d58656158d195a7df507ebc660010969
+refs/heads/master: 59ed6eecff4aa00c5c5d18ffd180acac108d596e
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
@@ -5339,6 +5339,9 @@ static pci_ers_result_t igb_io_error_detected(struct pci_dev *pdev,
 
 	netif_device_detach(netdev);
 
+	if (state == pci_channel_io_perm_failure)
+		return PCI_ERS_RESULT_DISCONNECT;
+
 	if (netif_running(netdev))
 		igb_down(adapter);
 	pci_disable_device(pdev);