2 files changed, 0 insertions, 15 deletions

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index f9c12e92fdd6..1d1750ef000a 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1888,14 +1888,6 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
 
         pr_info_once("%s", mlx4_ib_version);
 
-        mlx4_foreach_non_ib_transport_port(i, dev)
-                num_ports++;
-
-        if (mlx4_is_mfunc(dev) && num_ports) {
-                dev_err(&dev->pdev->dev, "RoCE is not supported over SRIOV as yet\n");
-                return NULL;
-        }
-
         num_ports = 0;
         mlx4_foreach_ib_transport_port(i, dev)
                 num_ports++;
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index 706a6d2b538c..74e490d70184 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -645,7 +645,6 @@ static int update_vport_qp_param(struct mlx4_dev *dev,
         struct mlx4_qp_context  *qpc = inbox->buf + 8;
         struct mlx4_vport_oper_state *vp_oper;
         struct mlx4_priv *priv;
-        u32 qp_type;
         int port;
 
         port = (qpc->pri_path.sched_queue & 0x40) ? 2 : 1;
@@ -653,12 +652,6 @@ static int update_vport_qp_param(struct mlx4_dev *dev,
         vp_oper = &priv->mfunc.master.vf_oper[slave].vport[port];
 
         if (MLX4_VGT != vp_oper->state.default_vlan) {
-                qp_type = (be32_to_cpu(qpc->flags) >> 16) & 0xff;
-                if (MLX4_QP_ST_RC == qp_type ||
-                    (MLX4_QP_ST_UD == qp_type &&
-                     !mlx4_is_qp_reserved(dev, qpn)))
-                        return -EINVAL;
-
                 /* the reserved QPs (special, proxy, tunnel)
                  * do not operate over vlans
                  */