kernel: Fix miss config and module for mlx driver
authorTan Zien <nabsdh9@gmail.com>
Sat, 4 Apr 2020 04:02:40 +0000 (12:02 +0800)
committerDavid Bauer <mail@david-bauer.net>
Sat, 4 Apr 2020 15:12:43 +0000 (17:12 +0200)
Missing config symbols could lead to build failures on kernel
4.14/4.19.

Signed-off-by: Tan Zien <nabsdh9@gmail.com>
[rephrase commit message - reorder symbols]
Signed-off-by: David Bauer <mail@david-bauer.net>
package/kernel/linux/modules/netdevices.mk

index 34503f1e834ec23ba3eff28675629d43996742ce..28f7648efeacf788c80e8bbba5010ffc8ef5877b 100644 (file)
@@ -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