From 57045c996fb4e035f1d152b7e04315fc223352e9 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Mon, 3 Jan 2011 15:21:45 +0000 Subject: [PATCH] cnic: Do not allow iSCSI and FCoE on bnx2x multi-function mode Because the hardware does not yet support these in this mode. Reviewed-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller --- drivers/net/cnic.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index 4a9c628..41957fa 100644 --- a/drivers/net/cnic.c +++ b/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)) -- 2.7.4