[net-next 13/16] net/mlx5: E-Switch, Use vport metadata matching by default

[saeed]

From: Vu Pham <vuhu...@mellanox.com>

Multiple features use metadata matching such as bond vport
in live migration, multi-port RoCE mode, stacked devices;
hence, enable vport metadata matching by default.

Fixes: 1e62e222db2e ("net/mlx5: E-Switch, Use vport metadata matching only when 
mandatory")
Signed-off-by: Vu Pham <vuhu...@mellanox.com>
Reviewed-by: Bodong Wang <bod...@nvidia.com>
Reviewed-by: Roi Dayan <r...@nvidia.com>
Reviewed-by: Parav Pandit <pa...@nvidia.com>
Reviewed-by: Mark Bloch <mbl...@nvidia.com>
Reviewed-by: Oz Shlomo <o...@nvidia.com>
Signed-off-by: Saeed Mahameed <sae...@nvidia.com>
---
 .../mellanox/mlx5/core/eswitch_offloads.c        | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c 
b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 3321bb1f188d..b23d20e16495 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -1864,18 +1864,6 @@ esw_check_vport_match_metadata_supported(const struct 
mlx5_eswitch *esw)
        return true;
 }
 
-static bool
-esw_check_vport_match_metadata_mandatory(const struct mlx5_eswitch *esw)
-{
-       return mlx5_core_mp_enabled(esw->dev);
-}
-
-static bool esw_use_vport_metadata(const struct mlx5_eswitch *esw)
-{
-       return esw_check_vport_match_metadata_mandatory(esw) &&
-              esw_check_vport_match_metadata_supported(esw);
-}
-
 u32 mlx5_esw_match_metadata_alloc(struct mlx5_eswitch *esw)
 {
        u32 num_vports = GENMASK(ESW_VPORT_BITS - 1, 0) - 1;
@@ -2159,9 +2147,9 @@ int esw_offloads_enable(struct mlx5_eswitch *esw)
 
        err = mlx5_esw_host_number_init(esw);
        if (err)
-               goto err_vport_metadata;
+               goto err_metadata;
 
-       if (esw_use_vport_metadata(esw))
+       if (esw_check_vport_match_metadata_supported(esw))
                esw->flags |= MLX5_ESWITCH_VPORT_MATCH_METADATA;
 
        err = esw_offloads_metadata_init(esw);
-- 
2.26.2