aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x/bnx2x_main.c
diff options
context:
space:
mode:
authorVladislav Zolotarov <vladz@broadcom.com>2011-07-18 21:43:25 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-19 12:57:49 -0400
commit019dbb4c0106f11b5c6543bffaedf10067e28398 (patch)
tree5f1ec88129843b2303c8b6cee2f4eff9cdbeb00f /drivers/net/bnx2x/bnx2x_main.c
parentd1c228d9b9b915a14cf362ebd817c10166be01e6 (diff)
bnx2x: disable loacal BH when scheduling FCOE napi
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_main.c')
-rw-r--r--drivers/net/bnx2x/bnx2x_main.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index a86517cffd4a..b8f8793912c8 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -4520,8 +4520,15 @@ static void bnx2x_sp_task(struct work_struct *work)
4520 struct bnx2x_fastpath *fp = bnx2x_fcoe_fp(bp); 4520 struct bnx2x_fastpath *fp = bnx2x_fcoe_fp(bp);
4521 4521
4522 if ((!NO_FCOE(bp)) && 4522 if ((!NO_FCOE(bp)) &&
4523 (bnx2x_has_rx_work(fp) || bnx2x_has_tx_work(fp))) 4523 (bnx2x_has_rx_work(fp) || bnx2x_has_tx_work(fp))) {
4524 /*
4525 * Prevent local bottom-halves from running as
4526 * we are going to change the local NAPI list.
4527 */
4528 local_bh_disable();
4524 napi_schedule(&bnx2x_fcoe(bp, napi)); 4529 napi_schedule(&bnx2x_fcoe(bp, napi));
4530 local_bh_enable();
4531 }
4525#endif 4532#endif
4526 /* Handle EQ completions */ 4533 /* Handle EQ completions */
4527 bnx2x_eq_int(bp); 4534 bnx2x_eq_int(bp);