diff options
| author | Vlad Buslov <vladbu@mellanox.com> | 2020-05-12 18:24:11 +0300 |
|---|---|---|
| committer | Saeed Mahameed <saeedm@mellanox.com> | 2020-05-23 02:46:14 +0300 |
| commit | d956873f908cff46dd55976dbd9442a027e9d9d1 (patch) | |
| tree | 30d669a7df50d61aee0b34c1dc28f42d44cac118 /drivers/net/ethernet/mellanox/mlx5/core/en/rep | |
| parent | e2394a61d243d74ec7d0bfd4c6e25171fba54caa (diff) | |
| download | linux-d956873f908cff46dd55976dbd9442a027e9d9d1.tar.xz | |
net/mlx5e: Introduce kconfig var for TC support
In order to improve code maintainability and readability, introduce new
CONFIG_MLX5_CLS_ACT kconfig variable to control compilation of TC hardware
offloads implementation. This allows distinguishing between features that
require TC support (MPLSoUDP, etc.) and features that just rely on
representor functionality (rep_bond for live migration, etc.).
Modify rep_tc.h, rep_neigh.h, en_tc.h and chains.h files to provide stubs
for functions that are called from generic code.
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en/rep')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.h | 11 | ||||
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.h | 44 |
2 files changed, 51 insertions, 4 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.h b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.h index 8eddb3ac0d74..32b239189c95 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.h @@ -7,6 +7,8 @@ #include "en.h" #include "en_rep.h" +#if IS_ENABLED(CONFIG_MLX5_CLS_ACT) + int mlx5e_rep_neigh_init(struct mlx5e_rep_priv *rpriv); void mlx5e_rep_neigh_cleanup(struct mlx5e_rep_priv *rpriv); @@ -20,4 +22,13 @@ void mlx5e_rep_neigh_entry_release(struct mlx5e_neigh_hash_entry *nhe); void mlx5e_rep_queue_neigh_stats_work(struct mlx5e_priv *priv); +#else /* CONFIG_MLX5_CLS_ACT */ + +static inline int +mlx5e_rep_neigh_init(struct mlx5e_rep_priv *rpriv) { return 0; } +static inline void +mlx5e_rep_neigh_cleanup(struct mlx5e_rep_priv *rpriv) {} + +#endif /* CONFIG_MLX5_CLS_ACT */ + #endif /* __MLX5_EN_REP_NEIGH__ */ diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.h b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.h index 90da00626b97..86f92abf2fdd 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.h @@ -5,11 +5,11 @@ #define __MLX5_EN_REP_TC_H__ #include <linux/skbuff.h> -#include "en.h" #include "en_tc.h" #include "en_rep.h" -struct mlx5e_rep_priv; +#if IS_ENABLED(CONFIG_MLX5_CLS_ACT) + int mlx5e_rep_tc_init(struct mlx5e_rep_priv *rpriv); void mlx5e_rep_tc_cleanup(struct mlx5e_rep_priv *rpriv); @@ -21,7 +21,6 @@ void mlx5e_rep_tc_disable(struct mlx5e_priv *priv); int mlx5e_rep_tc_event_port_affinity(struct mlx5e_priv *priv); -struct mlx5e_encap_entry; void mlx5e_rep_update_flows(struct mlx5e_priv *priv, struct mlx5e_encap_entry *e, bool neigh_connected, @@ -36,10 +35,47 @@ int mlx5e_rep_setup_tc(struct net_device *dev, enum tc_setup_type type, void *type_data); void mlx5e_rep_indr_clean_block_privs(struct mlx5e_rep_priv *rpriv); -struct mlx5e_tc_update_priv; bool mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe, struct sk_buff *skb, struct mlx5e_tc_update_priv *tc_priv); void mlx5_rep_tc_post_napi_receive(struct mlx5e_tc_update_priv *tc_priv); +#else /* CONFIG_MLX5_CLS_ACT */ + +struct mlx5e_rep_priv; +static inline int +mlx5e_rep_tc_init(struct mlx5e_rep_priv *rpriv) { return 0; } +static inline void +mlx5e_rep_tc_cleanup(struct mlx5e_rep_priv *rpriv) {} + +static inline int +mlx5e_rep_tc_netdevice_event_register(struct mlx5e_rep_priv *rpriv) { return 0; } +static inline void +mlx5e_rep_tc_netdevice_event_unregister(struct mlx5e_rep_priv *rpriv) {} + +static inline void +mlx5e_rep_tc_enable(struct mlx5e_priv *priv) {} +static inline void +mlx5e_rep_tc_disable(struct mlx5e_priv *priv) {} + +static inline int +mlx5e_rep_tc_event_port_affinity(struct mlx5e_priv *priv) { return NOTIFY_DONE; } + +static inline int +mlx5e_rep_setup_tc(struct net_device *dev, enum tc_setup_type type, + void *type_data) { return -EOPNOTSUPP; } + +static inline void +mlx5e_rep_indr_clean_block_privs(struct mlx5e_rep_priv *rpriv) {} + +struct mlx5e_tc_update_priv; +static inline bool +mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe, + struct sk_buff *skb, + struct mlx5e_tc_update_priv *tc_priv) { return true; } +static inline void +mlx5_rep_tc_post_napi_receive(struct mlx5e_tc_update_priv *tc_priv) {} + +#endif /* CONFIG_MLX5_CLS_ACT */ + #endif /* __MLX5_EN_REP_TC_H__ */ |