summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDean Nelson <dnelson@redhat.com>2009-07-31 09:13:48 +0000
committerDavid S. Miller <davem@davemloft.net>2009-08-01 23:12:03 -0700
commitfbc663ceeb7a48481a3b0290040528fbfd207282 (patch)
treea87263075d5f1f28cdbcd647c279f915205f343a /drivers
parentd6a1f83b63e6999ee9374330ea2d7924e775aff7 (diff)
downloadkernel-crypto-fbc663ceeb7a48481a3b0290040528fbfd207282.tar.gz
kernel-crypto-fbc663ceeb7a48481a3b0290040528fbfd207282.tar.xz
kernel-crypto-fbc663ceeb7a48481a3b0290040528fbfd207282.zip
qlge: return PCI_ERS_RESULT_DISCONNECT on permanent failure
PCI drivers that implement the struct pci_error_handlers' error_detected callback should return PCI_ERS_RESULT_DISCONNECT if the state passed in is pci_channel_io_perm_failure. This patch fixes the issue for qlge. Signed-off-by: Dean Nelson <dnelson@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/qlge/qlge_main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 5768af17f16..3a271afdd8f 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/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);