Skip to content

Commit 96c3415

Browse files
author
Saeed Mahameed
committed
net/mlx5: Kconfig: convert imply usage to weak dependency
MLX5_CORE uses the 'imply' keyword to depend on VXLAN, PTP_1588_CLOCK, MLXFW and PCI_HYPERV_INTERFACE. This was useful to force vxlan, ptp, etc.. to be reachable to mlx5 regardless of their config states. Due to the changes in the cited commit below, the semantics of 'imply' was changed to not force any restriction on the implied config. As a result of this change, the compilation of MLX5_CORE=y and VXLAN=m would result in undefined references, as VXLAN now would stay as 'm'. To fix this we change MLX5_CORE to have a weak dependency on these modules/configs and make sure they are reachable, by adding: depend on symbol || !symbol. For example: VXLAN=m MLX5_CORE=y, this will force MLX5_CORE to m Fixes: def2fbf ("kconfig: allow symbols implied by y to become m") Signed-off-by: Saeed Mahameed <[email protected]> Cc: Masahiro Yamada <[email protected]> Cc: Nicolas Pitre <[email protected]> Cc: Arnd Bergmann <[email protected]> Reported-by: Randy Dunlap <[email protected]>
1 parent e7e0004 commit 96c3415

File tree

1 file changed

+4
-4
lines changed
  • drivers/net/ethernet/mellanox/mlx5/core

1 file changed

+4
-4
lines changed

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ config MLX5_CORE
77
tristate "Mellanox 5th generation network adapters (ConnectX series) core driver"
88
depends on PCI
99
select NET_DEVLINK
10-
imply PTP_1588_CLOCK
11-
imply VXLAN
12-
imply MLXFW
13-
imply PCI_HYPERV_INTERFACE
10+
depends on VXLAN || !VXLAN
11+
depends on MLXFW || !MLXFW
12+
depends on PTP_1588_CLOCK || !PTP_1588_CLOCK
13+
depends on PCI_HYPERV_INTERFACE || !PCI_HYPERV_INTERFACE
1414
default n
1515
---help---
1616
Core driver for low level functionality of the ConnectX-4 and

0 commit comments

Comments
 (0)