net/mlx5e: en_tc: Rely just on register loopback for tunnel restoration
authorPaul Blakey <paulb@mellanox.com>
Tue, 10 Mar 2020 09:24:22 +0000 (11:24 +0200)
committerSaeed Mahameed <saeedm@mellanox.com>
Wed, 18 Mar 2020 02:41:26 +0000 (19:41 -0700)
Register loopback which is needed for tunnel restoration, is now always
enabled if supported and not just with metadata enabled, check for
that instead.

Signed-off-by: Paul Blakey <paulb@mellanox.com>
Reviewed-by: Oz Shlomo <ozsh@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

index 044891a..a2ff7df 100644 (file)
@@ -1985,11 +1985,11 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv,
        *match_inner = !needs_mapping;
 
        if ((needs_mapping || sets_mapping) &&
-           !mlx5_eswitch_vport_match_metadata_enabled(esw)) {
+           !mlx5_eswitch_reg_c1_loopback_enabled(esw)) {
                NL_SET_ERR_MSG(extack,
-                              "Chains on tunnel devices isn't supported without register metadata support");
+                              "Chains on tunnel devices isn't supported without register loopback support");
                netdev_warn(priv->netdev,
-                           "Chains on tunnel devices isn't supported without register metadata support");
+                           "Chains on tunnel devices isn't supported without register loopback support");
                return -EOPNOTSUPP;
        }