Commit 57045c99 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

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: default avatarBenjamin Li <benli@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a9180a2

drivers/net/cnic.c

+2 −6
Original line number Diff line number Diff line
@@ -4826,11 +4826,7 @@ 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_fcoe_conn = 0;

			dev->max_iscsi_conn = 0;

		}

	}