From 3b0cf39f6bfae3e69d75fc44533a08d20d6df72e Mon Sep 17 00:00:00 2001 From: Dean Nelson Date: Fri, 31 Jul 2009 09:13:02 +0000 Subject: [PATCH] --- yaml --- r: 159293 b: refs/heads/master c: 005fb4f0330afb2916ddc3f3c4c70e4555d64758 h: refs/heads/master i: 159291: 73f7a5ee9bef2f9bfbf0343eb6471c9d87b57d1c v: v3 --- [refs] | 2 +- trunk/drivers/net/atl1c/atl1c_main.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index af662b5e0348..32901a150250 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9509ac1295ce2ec121333d29b8a85a9e564f817 +refs/heads/master: 005fb4f0330afb2916ddc3f3c4c70e4555d64758 diff --git a/trunk/drivers/net/atl1c/atl1c_main.c b/trunk/drivers/net/atl1c/atl1c_main.c index a383122679de..1d601ce7d5b2 100644 --- a/trunk/drivers/net/atl1c/atl1c_main.c +++ b/trunk/drivers/net/atl1c/atl1c_main.c @@ -2678,6 +2678,9 @@ static pci_ers_result_t atl1c_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)) atl1c_down(adapter);