From 24a0a4811555d58e44c3cc66782372b3ad1e521a Mon Sep 17 00:00:00 2001
From: Dean Nelson <dnelson@redhat.com>
Date: Fri, 31 Jul 2009 09:14:03 +0000
Subject: [PATCH] --- yaml --- r: 159301 b: refs/heads/master c:
 e33b992d1504f21a8c2173245aeca4fc2ad632ab h: refs/heads/master i:   159299:
 58971d739c6b092d85040ec42447fc4b8f17b1fe v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/vxge/vxge-main.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 599901aaa5ee..82777f4dedfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e3c8bd63854a620680323681f28e60a44e26f0e
+refs/heads/master: e33b992d1504f21a8c2173245aeca4fc2ad632ab
diff --git a/trunk/drivers/net/vxge/vxge-main.c b/trunk/drivers/net/vxge/vxge-main.c
index 7b5402b50d0a..335140d2834a 100644
--- a/trunk/drivers/net/vxge/vxge-main.c
+++ b/trunk/drivers/net/vxge/vxge-main.c
@@ -3956,6 +3956,9 @@ static pci_ers_result_t vxge_io_error_detected(struct pci_dev *pdev,
 
 	netif_device_detach(netdev);
 
+	if (state == pci_channel_io_perm_failure)
+		return PCI_ERS_RESULT_DISCONNECT;
+
 	if (netif_running(netdev)) {
 		/* Bring down the card, while avoiding PCI I/O */
 		do_vxge_close(netdev, 0);