bnx2: reset_task is crashing the kernel. Fixing it.

If bnx2 schedules a reset via the reset_task, e.g., due to a TX
timeout, it's possible for the NIC to be disabled with packets
pending for transmit.  In this case, napi_disable will loop forever,
eventually crashing the kernel.  This patch moves the disable of
the device to after the napi_disable call.

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Breno Leitao 2009-12-18 20:29:04 -08:00 committed by David S. Miller
parent 3705e11a21
commit 4529819c45

View file

@ -653,7 +653,6 @@ static void
bnx2_netif_stop(struct bnx2 *bp) bnx2_netif_stop(struct bnx2 *bp)
{ {
bnx2_cnic_stop(bp); bnx2_cnic_stop(bp);
bnx2_disable_int_sync(bp);
if (netif_running(bp->dev)) { if (netif_running(bp->dev)) {
bnx2_napi_disable(bp); bnx2_napi_disable(bp);
netif_tx_disable(bp->dev); netif_tx_disable(bp->dev);
@ -672,6 +671,7 @@ bnx2_netif_start(struct bnx2 *bp)
bnx2_cnic_start(bp); bnx2_cnic_start(bp);
} }
} }
bnx2_disable_int_sync(bp);
} }
static void static void