summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Kravkov <dmitry@broadcom.com>2011-06-14 01:33:57 +0000
committerDavid S. Miller <davem@conan.davemloft.net>2011-06-15 10:56:56 -0400
commitef01854e24035a0b17ebeb98b05cfee2c8b36e02 (patch)
tree82ceb97f966fb46f95a3753af431d73d8118a39f
parentc9ee92062424375fe6e73c4af5d52df289ccf9eb (diff)
downloadlinux-3.10-ef01854e24035a0b17ebeb98b05cfee2c8b36e02.tar.gz
linux-3.10-ef01854e24035a0b17ebeb98b05cfee2c8b36e02.tar.bz2
linux-3.10-ef01854e24035a0b17ebeb98b05cfee2c8b36e02.zip
bnx2x: update DCB data during PMF migration
Signed-off-by: Dmitry Kravkov <dmitry@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>
-rw-r--r--drivers/net/bnx2x/bnx2x_dcb.h2
-rw-r--r--drivers/net/bnx2x/bnx2x_main.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x_dcb.h b/drivers/net/bnx2x/bnx2x_dcb.h
index 7887834cd65..b3a655ff2ba 100644
--- a/drivers/net/bnx2x/bnx2x_dcb.h
+++ b/drivers/net/bnx2x/bnx2x_dcb.h
@@ -184,7 +184,7 @@ enum {
};
void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state);
-
+void bnx2x_dcbx_pmf_update(struct bnx2x *bp);
/* DCB netlink */
#ifdef BCM_DCBNL
extern const struct dcbnl_rtnl_ops bnx2x_dcbnl_ops;
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 7ffb6e651e1..57fac3db9bd 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -2477,6 +2477,8 @@ static void bnx2x_pmf_update(struct bnx2x *bp)
bp->port.pmf = 1;
DP(NETIF_MSG_LINK, "pmf %d\n", bp->port.pmf);
+ bnx2x_dcbx_pmf_update(bp);
+
/* enable nig attention */
val = (0xff0f | (1 << (BP_E1HVN(bp) + 4)));
if (bp->common.int_block == INT_BLOCK_HC) {