diff options
| author | Michael Chan <mchan@broadcom.com> | 2011-01-03 10:21:45 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-03 22:08:07 -0500 |
| commit | 57045c996fb4e035f1d152b7e04315fc223352e9 (patch) | |
| tree | 9c453bf4878ca69f83e7198bd0ab0a24a9a5018a /drivers/net | |
| parent | 1a9180a20f3a314fda3e96b77570cad3864b2896 (diff) | |
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')
| -rw-r--r-- | drivers/net/cnic.c | 8 |
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) | |||
| 4826 | val = CNIC_RD(dev, addr); | 4826 | val = CNIC_RD(dev, addr); |
| 4827 | val &= FUNC_MF_CFG_E1HOV_TAG_MASK; | 4827 | val &= FUNC_MF_CFG_E1HOV_TAG_MASK; |
| 4828 | if (val != FUNC_MF_CFG_E1HOV_TAG_DEFAULT) { | 4828 | if (val != FUNC_MF_CFG_E1HOV_TAG_DEFAULT) { |
| 4829 | addr = BNX2X_MF_CFG_ADDR(mf_cfg_addr, | 4829 | dev->max_fcoe_conn = 0; |
| 4830 | func_mf_config[func].config); | 4830 | dev->max_iscsi_conn = 0; |
| 4831 | val = CNIC_RD(dev, addr); | ||
| 4832 | val &= FUNC_MF_CFG_PROTOCOL_MASK; | ||
| 4833 | if (val != FUNC_MF_CFG_PROTOCOL_ISCSI) | ||
| 4834 | dev->max_iscsi_conn = 0; | ||
| 4835 | } | 4831 | } |
| 4836 | } | 4832 | } |
| 4837 | if (!is_valid_ether_addr(dev->mac_addr)) | 4833 | if (!is_valid_ether_addr(dev->mac_addr)) |