From patchwork Tue May 31 20:42:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102271 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2174367qge; Tue, 31 May 2016 13:42:31 -0700 (PDT) X-Received: by 10.36.218.68 with SMTP id z65mr646695itg.19.1464727351265; Tue, 31 May 2016 13:42:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k4si23439393paa.181.2016.05.31.13.42.29; Tue, 31 May 2016 13:42:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756399AbcEaUm1 (ORCPT + 30 others); Tue, 31 May 2016 16:42:27 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:57733 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751484AbcEaUmZ (ORCPT ); Tue, 31 May 2016 16:42:25 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0M40UE-1bPmqW473C-00rZoJ; Tue, 31 May 2016 22:42:11 +0200 From: Arnd Bergmann To: "David S. Miller" Cc: Tom Herbert , Valentin Rothberg , Andreas Ziegler , Arnd Bergmann , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] fou: fix IPv6 Kconfig options Date: Tue, 31 May 2016 22:42:11 +0200 Message-Id: <1464727353-22489-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:7VFJlpTSNwbynxSJLT1EihVhNY8Y6P6YWZR6nz13NmUuYKLiL75 r/YOAqhGSc+Or43z2a8fGJKkKOEjja4V0Q8WJnENSnBNtD6ECWEZseAOei0mwMqikxnX3RG +d/X1HJX9YMeJAqKjbuP9vpcqCmCzuXs5E9GMfiiZg9nnZE15H4tVdjK3fDmBQrWrmBS+OM Vl0e6iH/+uUSUlfEbIBGQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:MWfEr+Hot1w=:F++5UF0cMmnCR2xn9Vp1yH nZTstRU4LUSV0hyJmcLuWl5vlYAS4ybZsaMibIyYxAFfbazdZI/K+7toZoRSTR9UqgUR9bPFD pYJ846ols8spHszrBclILfcB6rUNNaKwxUjcFs6Ag8rbooXDA7Y6if+pHsbLKo2k5QBNbUsLG X85bOOufx5Vqu1PNzex3Krrp8WIeUeKbuWku/ssdOx6HjTIt/d2O4MqrUlB9SQgNW9KaRTfCv 2uFAFwYZZs4Z4vrdEDAToyRJ/ncLojZFPSPdEM2AVMi5AlvMRxbNNDSMEUb60nAwOPAwhnYuZ MeNhK8VWwciv3zPuXEMEtEhqNw3wI7DmYpAz7nACL7rGuSJvIOgQuyS+0kgji5OUD9zmNe3/v i8uXZ+2BghvY9LiWUBIu9cuyzyGXS5arqbZftBd4pdNuHBC45/OLFCQlCdT/yVdmUitY1xmPb gGvb/BSvi0Gaxbpz0SEyjMStzkReaR59J3+MMwf2h4FbODk37YgfrxB/76e6QxnY8dCrRcHZQ rAyCdLZWmYL+hI6u4/g4euPbJCl8PZx356p/SXMoobLKMq3Kflu/IPyfr4fB6iSZXObhDsLVh zZsVcB/evqOTvc7rNNMyWCT3/wSTeNIqjPqqV/fAT+YTP7J5zKwCvT2t4BoASvcWwBREc51pf n2D8LjVYbkGhbf+nqVu4oS0R0bkqg9vS23Ni3BxaWh7b9SL6/uvVp4tRr537i8my4e/oQw2EE wIhAywJjlv8h6wpd Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Kconfig options I added to work around broken compilation ended up screwing up things more, as I used the wrong symbol to control compilation of the file, resulting in IPv6 fou support to never be built into the kernel. Changing CONFIG_NET_FOU_IPV6_TUNNELS to CONFIG_IPV6_FOU fixes that problem, I had renamed the symbol in one location but not the other, and as the file is never being used by other kernel code, this did not lead to a build failure that I would have caught. After that fix, another issue with the same patch becomes obvious, as we 'select INET6_TUNNEL', which is related to IPV6_TUNNEL, but not the same, and this can still cause the original build failure when IPV6_TUNNEL is not built-in but IPV6_FOU is. The fix is equally trivial, we just need to select the right symbol. I have successfully build 350 randconfig kernels with this patch and verified that the driver is now being built. Signed-off-by: Arnd Bergmann Reported-by: Valentin Rothberg Fixes: fabb13db448e ("fou: add Kconfig options for IPv6 support") --- net/ipv6/Kconfig | 2 +- net/ipv6/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.7.0 diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig index 994608263260..2343e4f2e0bf 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig @@ -239,7 +239,7 @@ config IPV6_FOU config IPV6_FOU_TUNNEL tristate default NET_FOU_IP_TUNNELS && IPV6_FOU - select INET6_TUNNEL + select IPV6_TUNNEL config IPV6_MULTIPLE_TABLES bool "IPv6: Multiple Routing Tables" diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile index d42ca3d1197f..6d8ea099213e 100644 --- a/net/ipv6/Makefile +++ b/net/ipv6/Makefile @@ -42,7 +42,7 @@ obj-$(CONFIG_IPV6_VTI) += ip6_vti.o obj-$(CONFIG_IPV6_SIT) += sit.o obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o obj-$(CONFIG_IPV6_GRE) += ip6_gre.o -obj-$(CONFIG_NET_FOU_IPV6_TUNNELS) += fou6.o +obj-$(CONFIG_IPV6_FOU) += fou6.o obj-y += addrconf_core.o exthdrs_core.o ip6_checksum.o ip6_icmp.o obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)