From 52f006bc9dca6a1d26b07a9c7b8b6e9e777ea612 Mon Sep 17 00:00:00 2001 From: Dean Nelson Date: Fri, 31 Jul 2009 09:13:40 +0000 Subject: [PATCH] --- yaml --- r: 159298 b: refs/heads/master c: d6a1f83b63e6999ee9374330ea2d7924e775aff7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgb/ixgb_main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 74ae4c2ec00a..2d7f92a6d61f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c06c430dedf71a0e9180d673191b9c9368aeaa65 +refs/heads/master: d6a1f83b63e6999ee9374330ea2d7924e775aff7 diff --git a/trunk/drivers/net/ixgb/ixgb_main.c b/trunk/drivers/net/ixgb/ixgb_main.c index eb917f160274..fad08ce8a6c3 100644 --- a/trunk/drivers/net/ixgb/ixgb_main.c +++ b/trunk/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);