From: Dean Nelson <dnelson@redhat.com>
Date: Fri, 31 Jul 2009 09:13:25 +0000 (+0000)
Subject: bnx2x: return PCI_ERS_RESULT_DISCONNECT on permanent failure
X-Git-Tag: v2.6.32-rc1~703^2~497
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=07ce50e434b62c4de05207109ecd3d615b3cce42;p=~shefty%2Frdma-dev.git

bnx2x: 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 bnx2x.

Signed-off-by: Dean Nelson <dnelson@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 2d035d795f0..c92d1a49886 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -11690,6 +11690,11 @@ static pci_ers_result_t bnx2x_io_error_detected(struct pci_dev *pdev,
 
 	netif_device_detach(dev);
 
+	if (state == pci_channel_io_perm_failure) {
+		rtnl_unlock();
+		return PCI_ERS_RESULT_DISCONNECT;
+	}
+
 	if (netif_running(dev))
 		bnx2x_eeh_nic_unload(bp);