Commit 0eb16f82 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller

ip_tunnel: fix building with NET_IP_TUNNEL=m

When af_mpls is built-in but the tunnel support is a module,
we get a link failure:

net/mpls/af_mpls.o: In function `mpls_init':
af_mpls.c:(.init.text+0xdc): undefined reference to `ip_tunnel_encap_add_ops'

This adds a Kconfig statement to prevent the broken
configuration and force mpls to be a module as well in
this case.

Fixes: bdc47641 ("ip_tunnel: add mpls over gre support")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarAmine Kherbouche <amine.kherbouche@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 08b49b94
...@@ -24,6 +24,7 @@ config NET_MPLS_GSO ...@@ -24,6 +24,7 @@ config NET_MPLS_GSO
config MPLS_ROUTING config MPLS_ROUTING
tristate "MPLS: routing support" tristate "MPLS: routing support"
depends on NET_IP_TUNNEL || NET_IP_TUNNEL=n
---help--- ---help---
Add support for forwarding of mpls packets. Add support for forwarding of mpls packets.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment