diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2017-11-11 16:29:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-14 03:11:45 +0100 |
| commit | ee0ab7a2b00fdb65e50ed9e252900b29c8fd802f (patch) | |
| tree | 5353fce27d2a66e5f445381c562b135aa31c3d37 /net/dsa | |
| parent | Merge branch 'net-improve-the-process-of-redirect-and-toobig-for-ipv6-tunnels' (diff) | |
| download | linux-ee0ab7a2b00fdb65e50ed9e252900b29c8fd802f.tar.xz linux-ee0ab7a2b00fdb65e50ed9e252900b29c8fd802f.zip | |
net: dsa: Fix dependencies on bridge
DSA now uses one of the symbols exported by the bridge,
br_vlan_enabled(). This has a stub, if the bridge is not
enabled. However, if the bridge is enabled, we cannot have DSA built
in and the bridge as a module, otherwise we get undefined symbols at
link time:
net/dsa/port.o: In function `dsa_port_vlan_add':
net/dsa/port.c:255: undefined reference to `br_vlan_enabled'
net/dsa/port.o: In function `dsa_port_vlan_del':
net/dsa/port.c:270: undefined reference to `br_vlan_enabled'
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig index 2fed892094bc..03c3bdf25468 100644 --- a/net/dsa/Kconfig +++ b/net/dsa/Kconfig @@ -7,6 +7,7 @@ config HAVE_NET_DSA config NET_DSA tristate "Distributed Switch Architecture" depends on HAVE_NET_DSA && MAY_USE_DEVLINK + depends on BRIDGE || BRIDGE=n select NET_SWITCHDEV select PHYLIB ---help--- |