net/mlx5: E-Switch, Remove redundant check of eswitch manager cap
authorBodong Wang <bodong@mellanox.com>
Thu, 2 Jan 2020 21:30:52 +0000 (15:30 -0600)
committerSaeed Mahameed <saeedm@mellanox.com>
Fri, 13 Mar 2020 23:25:59 +0000 (16:25 -0700)
esw_vport_create_legacy_acl_tables bails out immediately for eswitch
manager, hence remove all the check of esw manager cap after.

Signed-off-by: Bodong Wang <bodong@mellanox.com>
Reviewed-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c

index 2564086..b123089 100644 (file)
@@ -1707,8 +1707,7 @@ static int esw_vport_create_legacy_acl_tables(struct mlx5_eswitch *esw,
        if (mlx5_esw_is_manager_vport(esw, vport->vport))
                return 0;
 
-       if (!mlx5_esw_is_manager_vport(esw, vport->vport) &&
-           MLX5_CAP_ESW_INGRESS_ACL(esw->dev, flow_counter)) {
+       if (MLX5_CAP_ESW_INGRESS_ACL(esw->dev, flow_counter)) {
                vport->ingress.legacy.drop_counter = mlx5_fc_create(esw->dev, false);
                if (IS_ERR(vport->ingress.legacy.drop_counter)) {
                        esw_warn(esw->dev,
@@ -1722,8 +1721,7 @@ static int esw_vport_create_legacy_acl_tables(struct mlx5_eswitch *esw,
        if (ret)
                goto ingress_err;
 
-       if (!mlx5_esw_is_manager_vport(esw, vport->vport) &&
-           MLX5_CAP_ESW_EGRESS_ACL(esw->dev, flow_counter)) {
+       if (MLX5_CAP_ESW_EGRESS_ACL(esw->dev, flow_counter)) {
                vport->egress.legacy.drop_counter = mlx5_fc_create(esw->dev, false);
                if (IS_ERR(vport->egress.legacy.drop_counter)) {
                        esw_warn(esw->dev,