From 63d72989c3d518a3bee9c806e035110671f088f4 Mon Sep 17 00:00:00 2001
From: Dmitry Kravkov <dmitry@broadcom.com>
Date: Tue, 19 Jul 2011 01:46:11 +0000
Subject: [PATCH] --- yaml --- r: 256510 b: refs/heads/master c:
 928ad22a3b033a994081dbf49f3c046195dd2349 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index eb77feff6f55..baad02584985 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53e51e2f480aaa000b0a7d2704ce2b4b646a73c7
+refs/heads/master: 928ad22a3b033a994081dbf49f3c046195dd2349
diff --git a/trunk/drivers/net/bnx2x/bnx2x_main.c b/trunk/drivers/net/bnx2x/bnx2x_main.c
index e4dea114d04a..28ef7faf4480 100644
--- a/trunk/drivers/net/bnx2x/bnx2x_main.c
+++ b/trunk/drivers/net/bnx2x/bnx2x_main.c
@@ -10575,8 +10575,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*/
-	if (CHIP_IS_E1x(bp))
+	/* disable FCOE L2 queue for E1x and E3*/
+	if (CHIP_IS_E1x(bp) || CHIP_IS_E3(bp))
 		bp->flags |= NO_FCOE_FLAG;
 
 #endif