]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
bnx2x: do not call link update without HW notification
authorYaniv Rosner <yanivr@broadcom.com>
Tue, 14 Jun 2011 01:33:19 +0000 (01:33 +0000)
committerBob Picco <bob.picco@oracle.com>
Thu, 2 Feb 2012 23:03:26 +0000 (18:03 -0500)
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>
(cherry picked from commit 361c391e2339eb8d479feec9042ec6e822593350)

drivers/net/bnx2x/bnx2x_main.c

index bc358da9956825f37e3f5b304ade584cee0fac4b..c0c76d560ae2673c040c2655007400420fbbbcf4 100644 (file)
@@ -2848,9 +2848,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? */
                }