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: bdc4764 ("ip_tunnel: add mpls over gre support") Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Amine Kherbouche <[email protected]> Signed-off-by: David S. Miller <[email protected]>
ambv · Oct 12, 2017 · 0eb16f8 · 0eb16f8
1 parent 08b49b9
commit 0eb16f8
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/net/mpls/Kconfig b/net/mpls/Kconfig
@@ -24,6 +24,7 @@ config NET_MPLS_GSO
 
 config MPLS_ROUTING
 	tristate "MPLS: routing support"
+	depends on NET_IP_TUNNEL || NET_IP_TUNNEL=n
 	---help---
 	 Add support for forwarding of mpls packets.