From 625eb32ea496cb66b232fa4c1269d1207c938d5a Mon Sep 17 00:00:00 2001 From: Andre Detsch Date: Tue, 30 Jun 2009 12:46:13 +0000 Subject: [PATCH] --- yaml --- r: 154703 b: refs/heads/master c: eab633021c26025b34f36f79f0311d3d99f40ceb h: refs/heads/master i: 154701: b04de97e10996f12bf9fc936295984e333ca81f0 154699: d1f46da75393fbfbbb78f64fa495c9de790cde58 154695: aa15da0b7925a5b0ddbea59eb4f3d10bf0fa08ef 154687: 08f6d11f752a79eb344b06c69c711f64ddb98960 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fa9a8b588b09..d7da94844d43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 679be3ba0c493eb66d22c206273729ce50925e85 +refs/heads/master: eab633021c26025b34f36f79f0311d3d99f40ceb diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 972e06d984c8..5b8cbdb4b520 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -4823,6 +4823,9 @@ static pci_ers_result_t e1000_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)) e1000_down(adapter); pci_disable_device(pdev);