2020-11-06 16:16:14

by Vadym Kochan

Subject: [PATCH net] net: marvell: prestera: fix compilation with CONFIG_BRIDGE=m

With CONFIG_BRIDGE=m the compilation fails:

ld: drivers/net/ethernet/marvell/prestera/prestera_switchdev.o: in function `prestera_bridge_port_event':
prestera_switchdev.c:(.text+0x2ebd): undefined reference to `br_vlan_enabled'

in case the driver is statically enabled.

Fix it by adding 'BRIDGE || BRIDGE=n' dependency.

Fixes: e1189d9a5fbe ("net: marvell: prestera: Add Switchdev driver implementation")
Reported-by: Randy Dunlap <[email protected]>
Signed-off-by: Vadym Kochan <[email protected]>
---
drivers/net/ethernet/marvell/prestera/Kconfig | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/marvell/prestera/Kconfig b/drivers/net/ethernet/marvell/prestera/Kconfig
index b1fcc44f566a..b6f20e2034c6 100644
--- a/drivers/net/ethernet/marvell/prestera/Kconfig
+++ b/drivers/net/ethernet/marvell/prestera/Kconfig
@@ -6,6 +6,7 @@
config PRESTERA
tristate "Marvell Prestera Switch ASICs support"
depends on NET_SWITCHDEV && VLAN_8021Q
+ depends on BRIDGE || BRIDGE=n
select NET_DEVLINK
help
This driver supports Marvell Prestera Switch ASICs family.
--
2.17.1

2020-11-06 20:17:22

by Randy Dunlap

Subject: Re: [PATCH net] net: marvell: prestera: fix compilation with CONFIG_BRIDGE=m

On 11/6/20 8:11 AM, Vadym Kochan wrote:
> With CONFIG_BRIDGE=m the compilation fails:
>
> ld: drivers/net/ethernet/marvell/prestera/prestera_switchdev.o: in function `prestera_bridge_port_event':
> prestera_switchdev.c:(.text+0x2ebd): undefined reference to `br_vlan_enabled'
>
> in case the driver is statically enabled.
>
> Fix it by adding 'BRIDGE || BRIDGE=n' dependency.
>
> Fixes: e1189d9a5fbe ("net: marvell: prestera: Add Switchdev driver implementation")
> Reported-by: Randy Dunlap <[email protected]>
> Signed-off-by: Vadym Kochan <[email protected]>


Acked-by: Randy Dunlap <[email protected]> # build-tested

Thanks.

> ---
> drivers/net/ethernet/marvell/prestera/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/ethernet/marvell/prestera/Kconfig b/drivers/net/ethernet/marvell/prestera/Kconfig
> index b1fcc44f566a..b6f20e2034c6 100644
> --- a/drivers/net/ethernet/marvell/prestera/Kconfig
> +++ b/drivers/net/ethernet/marvell/prestera/Kconfig
> @@ -6,6 +6,7 @@
> config PRESTERA
> tristate "Marvell Prestera Switch ASICs support"
> depends on NET_SWITCHDEV && VLAN_8021Q
> + depends on BRIDGE || BRIDGE=n
> select NET_DEVLINK
> help
> This driver supports Marvell Prestera Switch ASICs family.
>


--
~Randy

2020-11-07 20:51:26

by Jakub Kicinski

Subject: Re: [PATCH net] net: marvell: prestera: fix compilation with CONFIG_BRIDGE=m

On Fri, 6 Nov 2020 12:13:12 -0800 Randy Dunlap wrote:
> On 11/6/20 8:11 AM, Vadym Kochan wrote:
> > With CONFIG_BRIDGE=m the compilation fails:
> >
> > ld: drivers/net/ethernet/marvell/prestera/prestera_switchdev.o: in function `prestera_bridge_port_event':
> > prestera_switchdev.c:(.text+0x2ebd): undefined reference to `br_vlan_enabled'
> >
> > in case the driver is statically enabled.
> >
> > Fix it by adding 'BRIDGE || BRIDGE=n' dependency.
> >
> > Fixes: e1189d9a5fbe ("net: marvell: prestera: Add Switchdev driver implementation")
> > Reported-by: Randy Dunlap <[email protected]>
> > Signed-off-by: Vadym Kochan <[email protected]>
>
> Acked-by: Randy Dunlap <[email protected]> # build-tested

Applied, thanks!

2020-11-07 20:52:55

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net] net: marvell: prestera: fix compilation with CONFIG_BRIDGE=m

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Fri, 6 Nov 2020 18:11:25 +0200 you wrote:
> With CONFIG_BRIDGE=m the compilation fails:
>
> ld: drivers/net/ethernet/marvell/prestera/prestera_switchdev.o: in function `prestera_bridge_port_event':
> prestera_switchdev.c:(.text+0x2ebd): undefined reference to `br_vlan_enabled'
>
> in case the driver is statically enabled.
>
> [...]

Here is the summary with links:
- [net] net: marvell: prestera: fix compilation with CONFIG_BRIDGE=m
https://git.kernel.org/netdev/net/c/4e0396c59559

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html