From: Joe Jin <joe.jin@oracle.com>
Date: Wed, 16 May 2012 10:40:45 +0000 (+0800)
Subject: bnx2x: allow FCoE and DCB for 578xx
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~556
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fe048c0ea0332fdd075459da1edf7a841cfd7b6b;p=users%2Fjedix%2Flinux-maple.git

bnx2x: allow FCoE and DCB for 578xx

(backported from commit 62ac0dc9ec0b90b83103ebb659e0696c344e4be4)
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>

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

diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 68be7cf674ebf..1135e78f2b4a2 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -10722,8 +10722,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