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>

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 4a9c628ab2a64b16fb009533dcf73c51a77a1da5..41957fa2d010eb83f1b1ec2ec852289bb3fd6733 100644 (file)
--- 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))