From 3a34d69bdcc6536e792bf53a49cfde355c1463e6 Mon Sep 17 00:00:00 2001
From: Dean Nelson <dnelson@redhat.com>
Date: Fri, 31 Jul 2009 09:13:18 +0000
Subject: [PATCH] --- yaml --- r: 159295 b: refs/heads/master c:
 2ec3de26d2dc666159b79a8b9394fa00b6f414ae h: refs/heads/master i:   159293:
 3b0cf39f6bfae3e69d75fc44533a08d20d6df72e   159291:
 73f7a5ee9bef2f9bfbf0343eb6471c9d87b57d1c   159287:
 a32eac941c9b004dc62e9e998d587d275784fca8   159279:
 c4e1607c8a025bf757e39c01ed3b324e402aff90   159263:
 e9b0d190f4de82cf80dbc7708389ce07e96cc7bc   159231:
 040bb7e9e5a92a4884f52dc258ad097bfa8c6898 v: v3

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

diff --git a/[refs] b/[refs]
index fafc38c7d038..def0546e437a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d6ab58da0465c42f34d9d4e7d91510278183c80
+refs/heads/master: 2ec3de26d2dc666159b79a8b9394fa00b6f414ae
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index cec1b1746ae0..756d4b4f0a9f 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -8199,6 +8199,11 @@ static pci_ers_result_t bnx2_io_error_detected(struct pci_dev *pdev,
 	rtnl_lock();
 	netif_device_detach(dev);
 
+	if (state == pci_channel_io_perm_failure) {
+		rtnl_unlock();
+		return PCI_ERS_RESULT_DISCONNECT;
+	}
+
 	if (netif_running(dev)) {
 		bnx2_netif_stop(bp);
 		del_timer_sync(&bp->timer);