| Message ID | 1462365155-3861405-1-git-send-email-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | net/mlx5e: Kconfig fixes | expand |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig index f5c3b9465d8d..5efba14a1453 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Kconfig +++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig @@ -38,3 +38,7 @@ config MLX5_CORE_EN_VXLAN depends on MLX5_CORE_EN && VXLAN && !(MLX5_CORE=y && VXLAN=m) ---help--- Say Y here if you want to use VXLAN offloads in the driver. + +config MLX5_CORE_EN_RFS + def_bool y + depends on MLX5_CORE_EN && RFS_ACCEL diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile index 6b8da0b36acd..29118c1debb7 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile +++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile @@ -11,4 +11,4 @@ mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o eswitch.o \ mlx5_core-$(CONFIG_MLX5_CORE_EN_VXLAN) += vxlan.o mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) += en_dcbnl.o -mlx5_core-$(CONFIG_RFS_ACCEL) += en_arfs.o +mlx5_core-$(CONFIG_MLX5_CORE_EN_RFS) += en_arfs.o
The RFS acceleration support in mlx5 is enabled whenever CONFIG_RFS_ACCEL is in use. However, this fails if a user turns off CONFIG_MLX5_CORE_EN, because the rfs code now calls into the ethernet portion of the driver: ERROR: "mlx5e_destroy_flow_table" [drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko] undefined! This patch adds another Kconfig symbol to control the compilation of the RFS code, to ensure it is only built if both the ethernet support and the core RFS support are enabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 4 ++++ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) -- 2.7.0