diff options
| author | Michael Chan <mchan@broadcom.com> | 2011-01-03 16:21:45 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-04 04:08:07 +0100 |
| commit | 57045c996fb4e035f1d152b7e04315fc223352e9 (patch) | |
| tree | 9c453bf4878ca69f83e7198bd0ab0a24a9a5018a | |
| parent | net/bridge: fix trivial sparse errors (diff) | |
| download | linux-57045c996fb4e035f1d152b7e04315fc223352e9.tar.xz 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>
| -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) 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)) |