Commit 4529819c authored by Breno Leitao's avatar Breno Leitao Committed by David S. Miller

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: default avatarBreno Leitao <leitao@linux.vnet.ibm.com>
Acked-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3705e11a
...@@ -653,7 +653,6 @@ static void ...@@ -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) ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment