| Message ID | 20171011135546.3536829-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 0eb16f82ecd40d4ce344ec882d6fb5c330f8ef39 |
| Headers | show |
| Series | [net-next] ip_tunnel: fix building with NET_IP_TUNNEL=m | expand |
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 >
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>
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.
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.
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(+) -- 2.9.0