From 801db63b04bcefa4130fdca2bc03b82d32e86cfb Mon Sep 17 00:00:00 2001
From: Dean Nelson <dnelson@redhat.com>
Date: Fri, 31 Jul 2009 09:13:25 +0000
Subject: [PATCH] --- yaml --- r: 159296 b: refs/heads/master c:
 07ce50e434b62c4de05207109ecd3d615b3cce42 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/bnx2x_main.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index def0546e437a..bbaef9781b43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ec3de26d2dc666159b79a8b9394fa00b6f414ae
+refs/heads/master: 07ce50e434b62c4de05207109ecd3d615b3cce42
diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c
index 2d035d795f02..c92d1a498867 100644
--- a/trunk/drivers/net/bnx2x_main.c
+++ b/trunk/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);