summaryrefslogtreecommitdiffstats
path: root/drivers/net/cnic.c
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2011-01-03 15:21:45 +0000
committerDavid S. Miller <davem@davemloft.net>2011-01-03 19:08:07 -0800
commit57045c996fb4e035f1d152b7e04315fc223352e9 (patch)
tree9c453bf4878ca69f83e7198bd0ab0a24a9a5018a /drivers/net/cnic.c
parent1a9180a20f3a314fda3e96b77570cad3864b2896 (diff)
downloadlinux-57045c996fb4e035f1d152b7e04315fc223352e9.tar.gz
linux-57045c996fb4e035f1d152b7e04315fc223352e9.tar.bz2
linux-57045c996fb4e035f1d152b7e04315fc223352e9.zip
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 <benli@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cnic.c')
-rw-r--r--drivers/net/cnic.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 4a9c628ab2a6..41957fa2d010 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))