summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorYaniv Rosner2011-06-14 03:33:19 +0200
committerDavid S. Miller2011-06-15 16:56:14 +0200
commit361c391e2339eb8d479feec9042ec6e822593350 (patch)
treeb58617f3cc1b42fe2ba502fc8b65af2a320b8233 /drivers/net
parentbnx2x: disable fairness if ETS is enabled (diff)
downloadkernel-qcow2-linux-361c391e2339eb8d479feec9042ec6e822593350.tar.gz
kernel-qcow2-linux-361c391e2339eb8d479feec9042ec6e822593350.tar.xz
kernel-qcow2-linux-361c391e2339eb8d479feec9042ec6e822593350.zip
bnx2x: do not call link update without HW notification
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/bnx2x/bnx2x_main.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index bc516bbcd9fd..2b4b376a69fb 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/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? */
}