summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBreno Leitao <leitao@linux.vnet.ibm.com>2010-08-26 08:27:58 +0000
committerDavid S. Miller <davem@davemloft.net>2010-08-26 14:09:14 -0700
commitfe5f098055ed7f701bfb16f8f87378cf67de9a0e (patch)
tree522d231c37c12afe7b0b76a8fe252094ce49b189 /drivers/net
parentbfc960a8eec023a170a80697fe65157cd4f44f81 (diff)
downloadblackbird-op-linux-fe5f098055ed7f701bfb16f8f87378cf67de9a0e.tar.gz
blackbird-op-linux-fe5f098055ed7f701bfb16f8f87378cf67de9a0e.zip
qlge: reset the chip before freeing the buffers
Qlge is freeing the buffers before stopping the card DMA, and this can cause some severe error, as a EEH event on PPC. This patch just stop the card and then free the resources. Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com> Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/qlge/qlge_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 8d63f69b27d9..5f89e83501f4 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -3919,12 +3919,12 @@ static int ql_adapter_down(struct ql_adapter *qdev)
for (i = 0; i < qdev->rss_ring_count; i++)
netif_napi_del(&qdev->rx_ring[i].napi);
- ql_free_rx_buffers(qdev);
-
status = ql_adapter_reset(qdev);
if (status)
netif_err(qdev, ifdown, qdev->ndev, "reset(func #%d) FAILED!\n",
qdev->func);
+ ql_free_rx_buffers(qdev);
+
return status;
}
OpenPOWER on IntegriCloud