Commit 185901ce authored by Vlad Buslov's avatar Vlad Buslov Committed by Saeed Mahameed
Browse files

net/mlx5e: Move TC-specific function definitions into MLX5_CLS_ACT 



en_tc.h header file declares several TC-specific functions in
CONFIG_MLX5_ESWITCH block even though those functions are only compiled
when CONFIG_MLX5_CLS_ACT is set, which is a recent change. Move them to
proper block.

Signed-off-by: default avatarVlad Buslov <vladbu@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Reviewed-by: default avatarMaor Dickman <maord@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 8fab0175

drivers/net/ethernet/mellanox/mlx5/core/en_tc.h

+8 −8
Original line number Diff line number Diff line
@@ -40,6 +40,14 @@ 


#ifdef CONFIG_MLX5_ESWITCH



int mlx5e_tc_num_filters(struct mlx5e_priv *priv, unsigned long flags);



struct mlx5e_tc_update_priv {

	struct net_device *tun_dev;

};



#if IS_ENABLED(CONFIG_MLX5_CLS_ACT)



struct tunnel_match_key {

	struct flow_dissector_key_control enc_control;

	struct flow_dissector_key_keyid enc_key_id;
@@ -114,8 +122,6 @@ void mlx5e_put_encap_flow_list(struct mlx5e_priv *priv, struct list_head *flow_l 
struct mlx5e_neigh_hash_entry;

void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe);



int mlx5e_tc_num_filters(struct mlx5e_priv *priv, unsigned long flags);



void mlx5e_tc_reoffload_flows_work(struct work_struct *work);



enum mlx5e_tc_attr_to_reg {
@@ -142,10 +148,6 @@ extern struct mlx5e_tc_attr_to_reg_mapping mlx5e_tc_attr_to_reg_mappings[]; 
bool mlx5e_is_valid_eswitch_fwd_dev(struct mlx5e_priv *priv,

				    struct net_device *out_dev);



struct mlx5e_tc_update_priv {

	struct net_device *tun_dev;

};



struct mlx5e_tc_mod_hdr_acts {

	int num_actions;

	int max_actions;
@@ -174,8 +176,6 @@ void mlx5e_tc_set_ethertype(struct mlx5_core_dev *mdev, 
			    struct flow_match_basic *match, bool outer,

			    void *headers_c, void *headers_v);



#if IS_ENABLED(CONFIG_MLX5_CLS_ACT)



int mlx5e_tc_nic_init(struct mlx5e_priv *priv);

void mlx5e_tc_nic_cleanup(struct mlx5e_priv *priv);

CRA Git | Maintained and supported by SUSTech CRA and CCSE