diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-11 15:55:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-12 21:21:11 +0200 |
| commit | 0eb16f82ecd40d4ce344ec882d6fb5c330f8ef39 (patch) | |
| tree | 1c7f76efd15ae7c7eb6c2cba2c7424a5f666df24 /net/mpls | |
| parent | Merge branch 'smc-ib_query_gid' (diff) | |
| download | linux-0eb16f82ecd40d4ce344ec882d6fb5c330f8ef39.tar.xz linux-0eb16f82ecd40d4ce344ec882d6fb5c330f8ef39.zip | |
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: bdc476413dcd ("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>
Diffstat (limited to 'net/mpls')
| -rw-r--r-- | net/mpls/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mpls/Kconfig b/net/mpls/Kconfig index 5c467ef97311..801ea9098387 100644 --- 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. |