提交 b7466560 编写于 作者: M Michael Chan 提交者: 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: NDavid S. Miller <davem@davemloft.net>
上级 7c65ec79
......@@ -666,6 +666,7 @@ bnx2_netif_stop(struct bnx2 *bp)
txq->trans_start = jiffies;
}
}
bnx2_disable_int_sync(bp);
}
static void
......@@ -679,7 +680,6 @@ bnx2_netif_start(struct bnx2 *bp)
bnx2_cnic_start(bp);
}
}
bnx2_disable_int_sync(bp);
}
static void
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册