From d95ced35707bafd51a215a1f208054de2108461f Mon Sep 17 00:00:00 2001
From: Dmitry Kravkov <dmitry@broadcom.com>
Date: Tue, 14 Jun 2011 01:33:57 +0000
Subject: [PATCH] --- yaml --- r: 255540 b: refs/heads/master c:
 ef01854e24035a0b17ebeb98b05cfee2c8b36e02 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e2f0178a9d77..8c969bd26d65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9ee92062424375fe6e73c4af5d52df289ccf9eb
+refs/heads/master: ef01854e24035a0b17ebeb98b05cfee2c8b36e02
diff --git a/trunk/drivers/net/bnx2x/bnx2x_dcb.h b/trunk/drivers/net/bnx2x/bnx2x_dcb.h
index 7887834cd65c..b3a655ff2bac 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_dcb.h
+++ b/trunk/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/trunk/drivers/net/bnx2x/bnx2x_main.c b/trunk/drivers/net/bnx2x/bnx2x_main.c
index 7ffb6e651e16..57fac3db9bde 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_main.c
+++ b/trunk/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) {