aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Kravkov <dmitry@broadcom.com>2011-06-13 21:33:57 -0400
committerDavid S. Miller <davem@conan.davemloft.net>2011-06-15 10:56:56 -0400
commitef01854e24035a0b17ebeb98b05cfee2c8b36e02 (patch)
tree82ceb97f966fb46f95a3753af431d73d8118a39f
parentc9ee92062424375fe6e73c4af5d52df289ccf9eb (diff)
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 7887834cd65c..b3a655ff2bac 100644
--- a/drivers/net/bnx2x/bnx2x_dcb.h
+++ b/drivers/net/bnx2x/bnx2x_dcb.h
@@ -184,7 +184,7 @@ enum {
184}; 184};
185 185
186void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state); 186void bnx2x_dcbx_set_params(struct bnx2x *bp, u32 state);
187 187void bnx2x_dcbx_pmf_update(struct bnx2x *bp);
188/* DCB netlink */ 188/* DCB netlink */
189#ifdef BCM_DCBNL 189#ifdef BCM_DCBNL
190extern const struct dcbnl_rtnl_ops bnx2x_dcbnl_ops; 190extern 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 7ffb6e651e16..57fac3db9bde 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)
2477 bp->port.pmf = 1; 2477 bp->port.pmf = 1;
2478 DP(NETIF_MSG_LINK, "pmf %d\n", bp->port.pmf); 2478 DP(NETIF_MSG_LINK, "pmf %d\n", bp->port.pmf);
2479 2479
2480 bnx2x_dcbx_pmf_update(bp);
2481
2480 /* enable nig attention */ 2482 /* enable nig attention */
2481 val = (0xff0f | (1 << (BP_E1HVN(bp) + 4))); 2483 val = (0xff0f | (1 << (BP_E1HVN(bp) + 4)));
2482 if (bp->common.int_block == INT_BLOCK_HC) { 2484 if (bp->common.int_block == INT_BLOCK_HC) {