From 12340f48972a5578d73e9e183ec5520808ac9076 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Mon, 3 Jan 2011 15:21:45 +0000
Subject: [PATCH] --- yaml --- r: 225456 b: refs/heads/master c:
 57045c996fb4e035f1d152b7e04315fc223352e9 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/cnic.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index aac2df591df7..94c31ddd6922 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a9180a20f3a314fda3e96b77570cad3864b2896
+refs/heads/master: 57045c996fb4e035f1d152b7e04315fc223352e9
diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c
index 4a9c628ab2a6..41957fa2d010 100644
--- a/trunk/drivers/net/cnic.c
+++ b/trunk/drivers/net/cnic.c
@@ -4826,12 +4826,8 @@ static void cnic_get_bnx2x_iscsi_info(struct cnic_dev *dev)
 		val = CNIC_RD(dev, addr);
 		val &= FUNC_MF_CFG_E1HOV_TAG_MASK;
 		if (val != FUNC_MF_CFG_E1HOV_TAG_DEFAULT) {
-			addr = BNX2X_MF_CFG_ADDR(mf_cfg_addr,
-				func_mf_config[func].config);
-			val = CNIC_RD(dev, addr);
-			val &= FUNC_MF_CFG_PROTOCOL_MASK;
-			if (val != FUNC_MF_CFG_PROTOCOL_ISCSI)
-				dev->max_iscsi_conn = 0;
+			dev->max_fcoe_conn = 0;
+			dev->max_iscsi_conn = 0;
 		}
 	}
 	if (!is_valid_ether_addr(dev->mac_addr))