From d24e43a7f622a8033f3703027fb19a617ae7aa02 Mon Sep 17 00:00:00 2001 From: Tan Zien Date: Sat, 4 Apr 2020 12:02:40 +0800 Subject: [PATCH] kernel: Fix miss config and module for mlx driver Missing config symbols could lead to build failures on kernel 4.14/4.19. Signed-off-by: Tan Zien [rephrase commit message - reorder symbols] Signed-off-by: David Bauer --- package/kernel/linux/modules/netdevices.mk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 34503f1e83..28f7648efe 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1095,12 +1095,15 @@ define KernelPackage/mlx4-core SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Mellanox ConnectX(R) mlx4 core Network Driver DEPENDS:=@PCI_SUPPORT +kmod-ptp - FILES:=$(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko + FILES:= \ + $(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko \ + $(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko KCONFIG:= CONFIG_MLX4_EN \ + CONFIG_MLX4_EN_DCB=n \ CONFIG_MLX4_CORE=y \ CONFIG_MLX4_CORE_GEN2=y \ CONFIG_MLX4_DEBUG=n - AUTOLOAD:=$(call AutoProbe,mlx4_core) + AUTOLOAD:=$(call AutoProbe,mlx4_core mlx4_en) endef define KernelPackage/mlx4-core/description @@ -1116,7 +1119,11 @@ define KernelPackage/mlx5-core FILES:=$(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko KCONFIG:= CONFIG_MLX5_CORE \ CONFIG_MLX5_CORE_EN=y \ - CONFIG_MLX5_EN_RXNFC=y + CONFIG_MLX5_EN_RXNFC=y \ + CONFIG_MLX5_FPGA=n \ + CONFIG_MLX5_MPFS=n \ + CONFIG_MLX5_EN_ARFS=n \ + CONFIG_MLX5_CORE_IPOIB=n AUTOLOAD:=$(call AutoProbe,mlx5_core) endef -- 2.25.1