From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757140AbdJLNQu (ORCPT ); Thu, 12 Oct 2017 09:16:50 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:45166 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756823AbdJLNQs (ORCPT ); Thu, 12 Oct 2017 09:16:48 -0400 X-Google-Smtp-Source: AOwi7QAfYPQraAUvcSjDcimYtqqPiW00lFeCnuWNuwRe45RLQ/1u/YCo/SG0yQQUbSSyLcyoLHykpQ== Subject: Re: [PATCH] [net-next] ip_tunnel: fix building with NET_IP_TUNNEL=m To: Arnd Bergmann , "David S. Miller" References: <20171011135546.3536829-1-arnd@arndb.de> Cc: Networking , Linux Kernel Mailing List From: Amine Kherbouche Message-ID: Date: Thu, 12 Oct 2017 15:16:36 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 >> --- >> 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