]> git.baikalelectronics.ru Git - kernel.git/commit
ip_tunnel: fix building with NET_IP_TUNNEL=m
authorArnd Bergmann <arnd@arndb.de>
Wed, 11 Oct 2017 13:55:31 +0000 (15:55 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Oct 2017 19:21:11 +0000 (12:21 -0700)
commit400879fbfad1aed926acc1aefcc36e87778ce4b7
tree1c7f76efd15ae7c7eb6c2cba2c7424a5f666df24
parent37d0eca46ae34fa39d665392aa40922fa7a02146
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: 2365e1a0aea4 ("ip_tunnel: add mpls over gre support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Amine Kherbouche <amine.kherbouche@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/mpls/Kconfig