diff mbox

[net-next] mlxsw: add psample dependency for spectrum

Message ID 20170206162642.693506-1-arnd@arndb.de
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Arnd Bergmann Feb. 6, 2017, 4:26 p.m. UTC
When PSAMPLE is a loadable module, spectrum must not be built-in:

drivers/net/built-in.o: In function `mlxsw_sp_rx_listener_sample_func':
spectrum.c:(.text+0xe357e): undefined reference to `psample_sample_packet'

This adds a Kconfig dependency to enforce usable configurations.

Fixes: 98d0f7b9acda ("mlxsw: spectrum: Add packet sample offloading support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Yotam Gigi Feb. 6, 2017, 4:41 p.m. UTC | #1
>-----Original Message-----
>From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org] On
>Behalf Of Arnd Bergmann
>Sent: Monday, February 06, 2017 6:27 PM
>To: Jiri Pirko <jiri@mellanox.com>; Ido Schimmel <idosch@mellanox.com>
>Cc: Arnd Bergmann <arnd@arndb.de>; David S. Miller <davem@davemloft.net>;
>Vadim Pasternak <vadimp@mellanox.com>; Elad Raz <eladr@mellanox.com>; Ivan
>Vecera <cera@cera.cz>; netdev@vger.kernel.org; linux-kernel@vger.kernel.org
>Subject: [PATCH] [net-next] mlxsw: add psample dependency for spectrum
>
>When PSAMPLE is a loadable module, spectrum must not be built-in:
>
>drivers/net/built-in.o: In function `mlxsw_sp_rx_listener_sample_func':
>spectrum.c:(.text+0xe357e): undefined reference to `psample_sample_packet'
>
>This adds a Kconfig dependency to enforce usable configurations.
>
>Fixes: 98d0f7b9acda ("mlxsw: spectrum: Add packet sample offloading support")
>Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Yotam Gigi <yotamg@mellanox.com>

>---
> drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/drivers/net/ethernet/mellanox/mlxsw/Kconfig
>b/drivers/net/ethernet/mellanox/mlxsw/Kconfig
>index 76a7574c3c7d..ef23eaedc2ff 100644
>--- a/drivers/net/ethernet/mellanox/mlxsw/Kconfig
>+++ b/drivers/net/ethernet/mellanox/mlxsw/Kconfig
>@@ -73,6 +73,7 @@ config MLXSW_SWITCHX2
> config MLXSW_SPECTRUM
> 	tristate "Mellanox Technologies Spectrum support"
> 	depends on MLXSW_CORE && MLXSW_PCI && NET_SWITCHDEV &&
>VLAN_8021Q
>+	depends on PSAMPLE || PSAMPLE=n
> 	select PARMAN
> 	default m
> 	---help---
>--
>2.9.0
Jiri Pirko Feb. 7, 2017, 9:47 a.m. UTC | #2
Mon, Feb 06, 2017 at 05:26:30PM CET, arnd@arndb.de wrote:
>When PSAMPLE is a loadable module, spectrum must not be built-in:
>
>drivers/net/built-in.o: In function `mlxsw_sp_rx_listener_sample_func':
>spectrum.c:(.text+0xe357e): undefined reference to `psample_sample_packet'
>
>This adds a Kconfig dependency to enforce usable configurations.
>
>Fixes: 98d0f7b9acda ("mlxsw: spectrum: Add packet sample offloading support")
>Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Jiri Pirko <jiri@mellanox.com>
David Miller Feb. 7, 2017, 4:44 p.m. UTC | #3
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon,  6 Feb 2017 17:26:30 +0100

> When PSAMPLE is a loadable module, spectrum must not be built-in:
> 
> drivers/net/built-in.o: In function `mlxsw_sp_rx_listener_sample_func':
> spectrum.c:(.text+0xe357e): undefined reference to `psample_sample_packet'
> 
> This adds a Kconfig dependency to enforce usable configurations.
> 
> Fixes: 98d0f7b9acda ("mlxsw: spectrum: Add packet sample offloading support")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Applied.
diff mbox

Patch

diff --git a/drivers/net/ethernet/mellanox/mlxsw/Kconfig b/drivers/net/ethernet/mellanox/mlxsw/Kconfig
index 76a7574c3c7d..ef23eaedc2ff 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlxsw/Kconfig
@@ -73,6 +73,7 @@  config MLXSW_SWITCHX2
 config MLXSW_SPECTRUM
 	tristate "Mellanox Technologies Spectrum support"
 	depends on MLXSW_CORE && MLXSW_PCI && NET_SWITCHDEV && VLAN_8021Q
+	depends on PSAMPLE || PSAMPLE=n
 	select PARMAN
 	default m
 	---help---