net/mlx5e: TC, Remove CONFIG_NET_TC_SKB_EXT dependency when restoring tunnel

CONFIG_NET_TC_SKB_EXT controls the SKB extension support for
restoring chain ids. SKB extension is not required for tunnel
restoration.

Remove the CONFIG_NET_TC_SKB_EXT dependency as a pre-step for
using the tunnel restore methods for sample offload use cases.

Signed-off-by: Chris Mi <cmi@nvidia.com>
Reviewed-by: Oz Shlomo <ozsh@nvidia.com>
Reviewed-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
index b35aa1ccd25055015d16522fce42464b414745b4..756b85349a9513a2f81cbbb115be47aa092f8dc0 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
@@ -516,7 +516,6 @@ void mlx5e_rep_tc_netdevice_event_unregister(struct mlx5e_rep_priv *rpriv)
                                 mlx5e_rep_indr_block_unbind);
 }
 
-#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)
 static bool mlx5e_restore_tunnel(struct mlx5e_priv *priv, struct sk_buff *skb,
                                 struct mlx5e_tc_update_priv *tc_priv,
                                 u32 tunnel_id)
@@ -615,6 +614,7 @@ static bool mlx5e_restore_skb(struct sk_buff *skb, u32 chain, u32 reg_c1,
        struct mlx5e_priv *priv = netdev_priv(skb->dev);
        u32 tunnel_id = (reg_c1 >> ESW_TUN_OFFSET) & TUNNEL_ID_MASK;
 
+#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)
        if (chain) {
                struct mlx5_rep_uplink_priv *uplink_priv;
                struct mlx5e_rep_priv *uplink_rpriv;
@@ -636,9 +636,10 @@ static bool mlx5e_restore_skb(struct sk_buff *skb, u32 chain, u32 reg_c1,
                                              zone_restore_id))
                        return false;
        }
+#endif /* CONFIG_NET_TC_SKB_EXT */
+
        return mlx5e_restore_tunnel(priv, skb, tc_priv, tunnel_id);
 }
-#endif /* CONFIG_NET_TC_SKB_EXT */
 
 bool mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe,
                             struct sk_buff *skb,
@@ -671,18 +672,14 @@ bool mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe,
                return false;
        }
 
-#if IS_ENABLED(CONFIG_NET_TC_SKB_EXT)
-       if (mapped_obj.type == MLX5_MAPPED_OBJ_CHAIN)
+       if (mapped_obj.type == MLX5_MAPPED_OBJ_CHAIN) {
                return mlx5e_restore_skb(skb, mapped_obj.chain, reg_c1, tc_priv);
-#endif /* CONFIG_NET_TC_SKB_EXT */
 #if IS_ENABLED(CONFIG_MLX5_TC_SAMPLE)
-       if (mapped_obj.type == MLX5_MAPPED_OBJ_SAMPLE) {
+       } else if (mapped_obj.type == MLX5_MAPPED_OBJ_SAMPLE) {
                mlx5e_tc_sample_skb(skb, &mapped_obj);
                return false;
-       }
 #endif /* CONFIG_MLX5_TC_SAMPLE */
-       if (mapped_obj.type != MLX5_MAPPED_OBJ_SAMPLE &&
-           mapped_obj.type != MLX5_MAPPED_OBJ_CHAIN) {
+       } else {
                netdev_dbg(priv->netdev, "Invalid mapped object type: %d\n", mapped_obj.type);
                return false;
        }