From a89269a6d3c159cc206cffab4a0e7132d5d89dd4 Mon Sep 17 00:00:00 2001
From: Yaniv Rosner <yanivr@broadcom.com>
Date: Tue, 14 Jun 2011 01:33:19 +0000
Subject: [PATCH] --- yaml --- r: 255533 b: refs/heads/master c:
 361c391e2339eb8d479feec9042ec6e822593350 h: refs/heads/master i:   255531:
 bb72f09b43d8bfda2bf59bb0d98bad430b540c43 v: v3

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

diff --git a/[refs] b/[refs]
index 72cd19ebc0ce..9da90d9df331 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30ae438b120bc63caa2328733c7c7119d5d29842
+refs/heads/master: 361c391e2339eb8d479feec9042ec6e822593350
diff --git a/trunk/drivers/net/bnx2x/bnx2x_main.c b/trunk/drivers/net/bnx2x/bnx2x_main.c
index bc516bbcd9fd..2b4b376a69fb 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_main.c
+++ b/trunk/drivers/net/bnx2x/bnx2x_main.c
@@ -2847,9 +2847,15 @@ static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted)
 
 			/* save nig interrupt mask */
 			nig_mask = REG_RD(bp, nig_int_mask_addr);
-			REG_WR(bp, nig_int_mask_addr, 0);
 
-			bnx2x_link_attn(bp);
+			/* If nig_mask is not set, no need to call the update
+			 * function.
+			 */
+			if (nig_mask) {
+				REG_WR(bp, nig_int_mask_addr, 0);
+
+				bnx2x_link_attn(bp);
+			}
 
 			/* handle unicore attn? */
 		}