Commit b7466560 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller

bnx2: Fix bnx2_netif_stop() merge error.

The error was introduced while merging:

commit 4529819c
bnx2: reset_task is crashing the kernel. Fixing it.

Signed-off-by: Michael Chan <mchan@broadcom.com>k
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c65ec79
...@@ -666,6 +666,7 @@ bnx2_netif_stop(struct bnx2 *bp) ...@@ -666,6 +666,7 @@ bnx2_netif_stop(struct bnx2 *bp)
txq->trans_start = jiffies; txq->trans_start = jiffies;
} }
} }
bnx2_disable_int_sync(bp);
} }
static void static void
...@@ -679,7 +680,6 @@ bnx2_netif_start(struct bnx2 *bp) ...@@ -679,7 +680,6 @@ 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