From: Dmitry Kravkov <dmitry@broadcom.com>
Date: Tue, 9 Aug 2011 03:11:13 +0000 (+0000)
Subject: bnx2x: disable dcb on 578xx since not supported yet
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~460
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f802abb7bc43b33f8c703c9229dbe9abff332314;p=users%2Fjedix%2Flinux-maple.git

bnx2x: disable dcb on 578xx since not supported yet

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 7712b644964c36d1216315b791faccc7d5238b16)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/bnx2x/bnx2x_dcb.c b/drivers/net/bnx2x/bnx2x_dcb.c
index 9a9bd3ab47938..99876f111c37e 100644
--- a/drivers/net/bnx2x/bnx2x_dcb.c
+++ b/drivers/net/bnx2x/bnx2x_dcb.c
@@ -914,7 +914,7 @@ static void bnx2x_dcbx_admin_mib_updated_params(struct bnx2x *bp,
 
 void bnx2x_dcbx_set_state(struct bnx2x *bp, bool dcb_on, u32 dcbx_enabled)
 {
-	if (!CHIP_IS_E1x(bp)) {
+	if (!CHIP_IS_E1x(bp) && !CHIP_IS_E3(bp)) {
 		bp->dcb_state = dcb_on;
 		bp->dcbx_enabled = dcbx_enabled;
 	} else {