From 14f274033364111b08cc00275bddbe3bc46ba4ba Mon Sep 17 00:00:00 2001 From: Dean Nelson Date: Fri, 31 Jul 2009 09:13:33 +0000 Subject: [PATCH] --- yaml --- r: 159297 b: refs/heads/master c: c06c430dedf71a0e9180d673191b9c9368aeaa65 h: refs/heads/master i: 159295: 3a34d69bdcc6536e792bf53a49cfde355c1463e6 v: v3 --- [refs] | 2 +- trunk/drivers/net/igbvf/netdev.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bbaef9781b43..74ae4c2ec00a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07ce50e434b62c4de05207109ecd3d615b3cce42 +refs/heads/master: c06c430dedf71a0e9180d673191b9c9368aeaa65 diff --git a/trunk/drivers/net/igbvf/netdev.c b/trunk/drivers/net/igbvf/netdev.c index 926c31b47261..3f03c42ece97 100644 --- a/trunk/drivers/net/igbvf/netdev.c +++ b/trunk/drivers/net/igbvf/netdev.c @@ -2511,6 +2511,9 @@ static pci_ers_result_t igbvf_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)) igbvf_down(adapter); pci_disable_device(pdev);