From 7fe75a399f5eda6522bf68d42d8be3a63f22207c Mon Sep 17 00:00:00 2001 From: Dean Nelson Date: Fri, 31 Jul 2009 09:13:10 +0000 Subject: [PATCH] --- yaml --- r: 159294 b: refs/heads/master c: 0d6ab58da0465c42f34d9d4e7d91510278183c80 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/atl1e/atl1e_main.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 32901a150250..fafc38c7d038 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 005fb4f0330afb2916ddc3f3c4c70e4555d64758 +refs/heads/master: 0d6ab58da0465c42f34d9d4e7d91510278183c80 diff --git a/trunk/drivers/net/atl1e/atl1e_main.c b/trunk/drivers/net/atl1e/atl1e_main.c index 9fc6d6d9060e..4570749e3d3b 100644 --- a/trunk/drivers/net/atl1e/atl1e_main.c +++ b/trunk/drivers/net/atl1e/atl1e_main.c @@ -2497,6 +2497,9 @@ atl1e_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state) netif_device_detach(netdev); + if (state == pci_channel_io_perm_failure) + return PCI_ERS_RESULT_DISCONNECT; + if (netif_running(netdev)) atl1e_down(adapter);