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

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
...@@ -4826,12 +4826,8 @@ static void cnic_get_bnx2x_iscsi_info(struct cnic_dev *dev) ...@@ -4826,12 +4826,8 @@ static void cnic_get_bnx2x_iscsi_info(struct cnic_dev *dev)
val = CNIC_RD(dev, addr); val = CNIC_RD(dev, addr);
val &= FUNC_MF_CFG_E1HOV_TAG_MASK; val &= FUNC_MF_CFG_E1HOV_TAG_MASK;
if (val != FUNC_MF_CFG_E1HOV_TAG_DEFAULT) { if (val != FUNC_MF_CFG_E1HOV_TAG_DEFAULT) {
addr = BNX2X_MF_CFG_ADDR(mf_cfg_addr, dev->max_fcoe_conn = 0;
func_mf_config[func].config); dev->max_iscsi_conn = 0;
val = CNIC_RD(dev, addr);
val &= FUNC_MF_CFG_PROTOCOL_MASK;
if (val != FUNC_MF_CFG_PROTOCOL_ISCSI)
dev->max_iscsi_conn = 0;
} }
} }
if (!is_valid_ether_addr(dev->mac_addr)) if (!is_valid_ether_addr(dev->mac_addr))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment