Skip to content

Commit 188f0f9

Browse files
paravmellanoxSaeed Mahameed
authored andcommitted
net/mlx5: Avoid eswitch header inclusion in fs core layer
Flow steering core layer is independent of the eswitch layer. Hence avoid fs_core dependency on eswitch. Fixes: 328edb4 ("net/mlx5: Split FDB fast path prio to multiple namespaces") Signed-off-by: Parav Pandit <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]>
1 parent 9205d7b commit 188f0f9

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,6 @@
4444
#include "lib/mpfs.h"
4545
#include "en/tc_ct.h"
4646

47-
#define FDB_TC_MAX_CHAIN 3
48-
#define FDB_FT_CHAIN (FDB_TC_MAX_CHAIN + 1)
49-
#define FDB_TC_SLOW_PATH_CHAIN (FDB_FT_CHAIN + 1)
50-
51-
/* The index of the last real chain (FT) + 1 as chain zero is valid as well */
52-
#define FDB_NUM_CHAINS (FDB_FT_CHAIN + 1)
53-
54-
#define FDB_TC_MAX_PRIO 16
55-
#define FDB_TC_LEVELS_PER_PRIO 2
56-
5747
#ifdef CONFIG_MLX5_ESWITCH
5848

5949
#define ESW_OFFLOADS_DEFAULT_NUM_GROUPS 15

drivers/net/ethernet/mellanox/mlx5/core/fs_core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
#include "diag/fs_tracepoint.h"
4242
#include "accel/ipsec.h"
4343
#include "fpga/ipsec.h"
44-
#include "eswitch.h"
4544

4645
#define INIT_TREE_NODE_ARRAY_SIZE(...) (sizeof((struct init_tree_node[]){__VA_ARGS__}) /\
4746
sizeof(struct init_tree_node))

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,16 @@
3939
#include <linux/llist.h>
4040
#include <steering/fs_dr.h>
4141

42+
#define FDB_TC_MAX_CHAIN 3
43+
#define FDB_FT_CHAIN (FDB_TC_MAX_CHAIN + 1)
44+
#define FDB_TC_SLOW_PATH_CHAIN (FDB_FT_CHAIN + 1)
45+
46+
/* The index of the last real chain (FT) + 1 as chain zero is valid as well */
47+
#define FDB_NUM_CHAINS (FDB_FT_CHAIN + 1)
48+
49+
#define FDB_TC_MAX_PRIO 16
50+
#define FDB_TC_LEVELS_PER_PRIO 2
51+
4252
struct mlx5_modify_hdr {
4353
enum mlx5_flow_namespace_type ns_type;
4454
union {

0 commit comments

Comments
 (0)