summaryrefslogtreecommitdiffstats
path: root/drivers/net/vxge
diff options
context:
space:
mode:
authorDean Nelson <dnelson@redhat.com>2009-07-31 09:14:03 +0000
committerDavid S. Miller <davem@davemloft.net>2009-08-01 23:12:12 -0700
commite33b992d1504f21a8c2173245aeca4fc2ad632ab (patch)
tree75f5ffee79bbfe7eba06abb38fb76393ac787773 /drivers/net/vxge
parent1e3c8bd63854a620680323681f28e60a44e26f0e (diff)
downloadlinux-e33b992d1504f21a8c2173245aeca4fc2ad632ab.tar.bz2
vxge: 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 vxge. Signed-off-by: Dean Nelson <dnelson@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxge')
-rw-r--r--drivers/net/vxge/vxge-main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 7b5402b50d0a..335140d2834a 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/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);