From aea4e88276983bade7ee9f6fddde2b2ed6e5256e Mon Sep 17 00:00:00 2001 From: Andre Detsch Date: Mon, 8 Jun 2009 00:42:30 -0700 Subject: [PATCH] --- yaml --- r: 150747 b: refs/heads/master c: ef681ce1e8b3e63317cd724c200b2fd39286c005 h: refs/heads/master i: 150745: cee20746dd68537de800fe9268e70d5301a1fd70 150743: 5f42265e998fd0d3fc1a9f9e9231e355bce088ec v: v3 --- [refs] | 2 +- trunk/drivers/net/e100.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5ac849d4414c..8aab35f0bc71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d0ebfe7c9621d43804e9ce9f2b898541a7d9652 +refs/heads/master: ef681ce1e8b3e63317cd724c200b2fd39286c005 diff --git a/trunk/drivers/net/e100.c b/trunk/drivers/net/e100.c index 0f9ee1348552..0c37dd97fa09 100644 --- a/trunk/drivers/net/e100.c +++ b/trunk/drivers/net/e100.c @@ -2822,12 +2822,13 @@ static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel struct net_device *netdev = pci_get_drvdata(pdev); struct nic *nic = netdev_priv(netdev); - /* Similar to calling e100_down(), but avoids adapter I/O. */ - e100_close(netdev); - - /* Detach; put netif into a state similar to hotplug unplug. */ - napi_enable(&nic->napi); netif_device_detach(netdev); + + if (state == pci_channel_io_perm_failure) + return PCI_ERS_RESULT_DISCONNECT; + + if (netif_running(netdev)) + e100_down(nic); pci_disable_device(pdev); /* Request a slot reset. */