From 8570b519126f20fdceb8d0526b12229b52aee407 Mon Sep 17 00:00:00 2001
From: Vladislav Zolotarov <vladz@broadcom.com>
Date: Tue, 19 Jul 2011 01:43:25 +0000
Subject: [PATCH] --- yaml --- r: 256507 b: refs/heads/master c:
 019dbb4c0106f11b5c6543bffaedf10067e28398 h: refs/heads/master i:   256505:
 0ffb6a0836e0c295bc5670331d7b4a5f52d0aa4f   256503:
 4074acd0b6f4114d4eda57b97b3c3647271bb8f4 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/bnx2x/bnx2x_main.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e66e096359d4..5a947f9b15e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1c228d9b9b915a14cf362ebd817c10166be01e6
+refs/heads/master: 019dbb4c0106f11b5c6543bffaedf10067e28398
diff --git a/trunk/drivers/net/bnx2x/bnx2x_main.c b/trunk/drivers/net/bnx2x/bnx2x_main.c
index a86517cffd4a..b8f8793912c8 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_main.c
+++ b/trunk/drivers/net/bnx2x/bnx2x_main.c
@@ -4520,8 +4520,15 @@ static void bnx2x_sp_task(struct work_struct *work)
 		struct bnx2x_fastpath *fp = bnx2x_fcoe_fp(bp);
 
 		if ((!NO_FCOE(bp)) &&
-			(bnx2x_has_rx_work(fp) || bnx2x_has_tx_work(fp)))
+			(bnx2x_has_rx_work(fp) || bnx2x_has_tx_work(fp))) {
+			/*
+			 * Prevent local bottom-halves from running as
+			 * we are going to change the local NAPI list.
+			 */
+			local_bh_disable();
 			napi_schedule(&bnx2x_fcoe(bp, napi));
+			local_bh_enable();
+		}
 #endif
 		/* Handle EQ completions */
 		bnx2x_eq_int(bp);