From: Dean Nelson Date: Fri, 31 Jul 2009 09:13:40 +0000 (+0000) Subject: ixgb: return PCI_ERS_RESULT_DISCONNECT on permanent failure X-Git-Tag: MMI-PSA29.97-13-9~26976^2~495 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d6a1f83b63e6999ee9374330ea2d7924e775aff7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ixgb: 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 ixgb. Signed-off-by: Dean Nelson Signed-off-by: David S. Miller --- diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index eb917f160274..fad08ce8a6c3 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c @@ -2227,6 +2227,11 @@ static pci_ers_result_t ixgb_io_error_detected(struct pci_dev *pdev, struct net_device *netdev = pci_get_drvdata(pdev); struct ixgb_adapter *adapter = netdev_priv(netdev); + netif_device_detach(netdev); + + if (state == pci_channel_io_perm_failure) + return PCI_ERS_RESULT_DISCONNECT; + if (netif_running(netdev)) ixgb_down(adapter, true);