From 58971d739c6b092d85040ec42447fc4b8f17b1fe Mon Sep 17 00:00:00 2001 From: Dean Nelson Date: Fri, 31 Jul 2009 09:13:48 +0000 Subject: [PATCH] --- yaml --- r: 159299 b: refs/heads/master c: fbc663ceeb7a48481a3b0290040528fbfd207282 h: refs/heads/master i: 159297: 14f274033364111b08cc00275bddbe3bc46ba4ba 159295: 3a34d69bdcc6536e792bf53a49cfde355c1463e6 v: v3 --- [refs] | 2 +- trunk/drivers/net/qlge/qlge_main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2d7f92a6d61f..6eba0ead1c21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6a1f83b63e6999ee9374330ea2d7924e775aff7 +refs/heads/master: fbc663ceeb7a48481a3b0290040528fbfd207282 diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c index 5768af17f168..3a271afdd8f5 100644 --- a/trunk/drivers/net/qlge/qlge_main.c +++ b/trunk/drivers/net/qlge/qlge_main.c @@ -4076,6 +4076,11 @@ static pci_ers_result_t qlge_io_error_detected(struct pci_dev *pdev, struct net_device *ndev = pci_get_drvdata(pdev); struct ql_adapter *qdev = netdev_priv(ndev); + netif_device_detach(ndev); + + if (state == pci_channel_io_perm_failure) + return PCI_ERS_RESULT_DISCONNECT; + if (netif_running(ndev)) ql_adapter_down(qdev);