---

yaml --- r: 256507 b: refs/heads/master c: 019dbb4 h: refs/heads/master i: 256505: 0ffb6a0 256503: 4074acd v: v3
git-mirror · Jul 19, 2011 · 8570b51 · 8570b51
1 parent 009bc6f
commit 8570b51
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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);