From 13a8fd7feb3f478fb973f880f07a884dc8eb8d45 Mon Sep 17 00:00:00 2001
From: Dmitry Kravkov <dmitry@broadcom.com>
Date: Sun, 13 Nov 2011 04:34:21 +0000
Subject: [PATCH] --- yaml --- r: 277509 b: refs/heads/master c:
 62ac0dc9ec0b90b83103ebb659e0696c344e4be4 h: refs/heads/master i:   277507:
 cad0fad711cd271debf59cf6b2cf57e15853f6a0 v: v3

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

diff --git a/[refs] b/[refs]
index e406e41b3fb5..80bf0836636b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6589ade019dcab245d3bb847370f855b56cdf6ad
+refs/heads/master: 62ac0dc9ec0b90b83103ebb659e0696c344e4be4
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
index 51bd7485ab18..5cba9d76b3c0 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
@@ -923,7 +923,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) && !CHIP_IS_E3(bp)) {
+	if (!CHIP_IS_E1x(bp)) {
 		bp->dcb_state = dcb_on;
 		bp->dcbx_enabled = dcbx_enabled;
 	} else {
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 6486ab8c8fc8..6f3a78468bad 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -10817,8 +10817,8 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
 	bp->qm_cid_count = bnx2x_set_qm_cid_count(bp);
 
 #ifdef BCM_CNIC
-	/* disable FCOE L2 queue for E1x and E3*/
-	if (CHIP_IS_E1x(bp) || CHIP_IS_E3(bp))
+	/* disable FCOE L2 queue for E1x */
+	if (CHIP_IS_E1x(bp))
 		bp->flags |= NO_FCOE_FLAG;
 
 #endif