* [PATCH] [net-next] ip_tunnel: fix building with NET_IP_TUNNEL=m
@ 2017-10-11 13:55 Arnd Bergmann
2017-10-11 13:57 ` Arnd Bergmann
2017-10-12 19:21 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Arnd Bergmann @ 2017-10-11 13:55 UTC (permalink / raw)
To: David S. Miller; +Cc: Arnd Bergmann, netdev, linux-kernel
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>
---
net/mpls/Kconfig | 1 +
1 file changed, 1 insertion(+)
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.
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] [net-next] ip_tunnel: fix building with NET_IP_TUNNEL=m
2017-10-11 13:55 [PATCH] [net-next] ip_tunnel: fix building with NET_IP_TUNNEL=m Arnd Bergmann
@ 2017-10-11 13:57 ` Arnd Bergmann
2017-10-12 13:16 ` Amine Kherbouche
2017-10-12 19:21 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2017-10-11 13:57 UTC (permalink / raw)
To: David S. Miller
Cc: Arnd Bergmann, Networking, Linux Kernel Mailing List,
Amine Kherbouche
I forgot to Cc Amine, sorry.
On Wed, Oct 11, 2017 at 3:55 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> 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>
> ---
> net/mpls/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> 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.
>
> --
> 2.9.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] [net-next] ip_tunnel: fix building with NET_IP_TUNNEL=m
2017-10-11 13:57 ` Arnd Bergmann
@ 2017-10-12 13:16 ` Amine Kherbouche
0 siblings, 0 replies; 4+ messages in thread
From: Amine Kherbouche @ 2017-10-12 13:16 UTC (permalink / raw)
To: Arnd Bergmann, David S. Miller; +Cc: Networking, Linux Kernel Mailing List
Hi Arnd,
On 10/11/2017 03:57 PM, Arnd Bergmann wrote:
> I forgot to Cc Amine, sorry.
>
> On Wed, Oct 11, 2017 at 3:55 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>> 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>
>> ---
>> net/mpls/Kconfig | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> 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.
>>
>> --
>> 2.9.0
>>
Acked-by: Amine Kherbouche <amine.kherbouche@6wind.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] [net-next] ip_tunnel: fix building with NET_IP_TUNNEL=m
2017-10-11 13:55 [PATCH] [net-next] ip_tunnel: fix building with NET_IP_TUNNEL=m Arnd Bergmann
2017-10-11 13:57 ` Arnd Bergmann
@ 2017-10-12 19:21 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2017-10-12 19:21 UTC (permalink / raw)
To: arnd; +Cc: netdev, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 11 Oct 2017 15:55:31 +0200
> 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>
Applied, thanks Arnd.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-10-12 19:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-11 13:55 [PATCH] [net-next] ip_tunnel: fix building with NET_IP_TUNNEL=m Arnd Bergmann
2017-10-11 13:57 ` Arnd Bergmann
2017-10-12 13:16 ` Amine Kherbouche
2017-10-12 19:21 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).