]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
mlxsw: spectrum: Add bridge dependency for spectrum
authorIdo Schimmel <idosch@mellanox.com>
Wed, 31 May 2017 18:33:42 +0000 (21:33 +0300)
committerDavid S. Miller <davem@davemloft.net>
Thu, 1 Jun 2017 19:06:45 +0000 (15:06 -0400)
When BRIDGE is a loadable module, MLXSW_SPECTRUM mustn't be built-in:

drivers/built-in.o: In function `mlxsw_sp_bridge_device_create':
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c:145: undefined reference to `br_vlan_enabled'
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c:158: undefined reference to `br_multicast_enabled'
drivers/built-in.o: In function `mlxsw_sp_dev_rif_type':
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c:2972: undefined reference to `br_vlan_enabled'
drivers/built-in.o: In function `mlxsw_sp_inetaddr_vlan_event':
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c:3310: undefined reference to `br_vlan_enabled'

Add Kconfig dependency to enforce usable configurations.

Fixes: c57529e1d5d8 ("mlxsw: spectrum: Replace vPorts with Port-VLAN")
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reported-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Tested-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/Kconfig

index b9f80c2a8ae929a059fa2c9f412f0d20117219b5..695adff89d717d8249fcae7ab0a56dfff32981ca 100644 (file)
@@ -74,6 +74,7 @@ config MLXSW_SPECTRUM
        tristate "Mellanox Technologies Spectrum support"
        depends on MLXSW_CORE && MLXSW_PCI && NET_SWITCHDEV && VLAN_8021Q
        depends on PSAMPLE || PSAMPLE=n
+       depends on BRIDGE || BRIDGE=n
        select PARMAN
        select MLXFW
        default m