From patchwork Fri Jul 6 12:59:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 141311 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3085440ljj; Fri, 6 Jul 2018 06:00:32 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeHctPQJVJxA5qMlEAsbxZp4fKnTZ9ZvdwkozMiegFQgZuG+k4GyUXqBsSXOE7jr6OzwHj+ X-Received: by 2002:a17:902:4381:: with SMTP id j1-v6mr10242671pld.104.1530882031944; Fri, 06 Jul 2018 06:00:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530882031; cv=none; d=google.com; s=arc-20160816; b=CuhqcDhqqxwaxr/D3lu6anVjj9D44/tonb4HfAAgippVdDI0V6UqhmlYECtTp2E0UN OhVDlj3WyqcHl2yAeYuddEgdx3L1Nkh/x/9GcSJOOQYLeKEmQzLhD43NQJVLDwNcSMPI uLyFJCy+BdefUKgibJEKa13qmwXhPiOv7bwyf6r3vWLzLK6M+dVqE4fWbw3PCLPvuKSs zJew8lKj2IgKaUUY552z+hTKWIbTnkM9yFF0RQvmtuSEYiyIoP/eEkKPKNgkLlVtKXey DSRS3lE5/I4g+rOWbsULAgFc7iYjosDtJ5Vzrm2dCaibRnWnl3IY8AqfNRo+Trm4b1qv chlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=/NcaxGET95ZuPjNuXmGViJDuzQKa8EQatsv0Wrp5x5U=; b=biTsXumt56api/5OeOV/rvzKk489MV1OSIKWmQKtiO/kyvDE5Z9VwynX4TUN91+orU ag0UPU5JDW2Bg+yZJFrHT5+GqSQzZxdJ8+8wil/CUW2r/it+5dSZcJcKvIgG2S+RTzwq meXj8UqkOLdiD9GDxU2olKL2K0hibUl/L209cj49O1VwalLDY7AhurWgUyCyuHvMY3v7 B81h3GytRcVxqDXhCaXZq0xYeyWMNYyrMjX1wa3RVbXA6yyCeKGlQ6rmbMMgP820lQLy 2Um0YssaArj3FpPlYcrF/K2SFWoI3qCAFouiiQMyoQnL1f9MgJapLpR6cq4J8ffH3LrV piXA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b35-v6si8117558plh.36.2018.07.06.06.00.31; Fri, 06 Jul 2018 06:00: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 S932644AbeGFNA3 (ORCPT + 31 others); Fri, 6 Jul 2018 09:00:29 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:52657 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932938AbeGFNA0 (ORCPT ); Fri, 6 Jul 2018 09:00:26 -0400 Received: from wuerfel.lan ([46.223.138.35]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MWSUM-1fczhF4AlG-00XbBL; Fri, 06 Jul 2018 15:00:08 +0200 From: Arnd Bergmann To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" Cc: Arnd Bergmann , =?utf-8?b?TcOhdMOpIEVja2w=?= , Fernando Fernandez Mancera , "Pablo M. Bermudo Garay" , Felix Fietkau , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] netfilter: conntrack: add weak IPV6 dependency Date: Fri, 6 Jul 2018 14:59:52 +0200 Message-Id: <20180706130005.3640993-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:ceghUajkeFq9CBwXS/1CopdxdW/Uwa8EgyejHZl7h/NmHNnYjcP t2wCamvDsnIBzOqkV/BIrbW1Y5eqMFauruKHmroQsA06tS1xc4x4Lzi8Ow9OmqlEwFNLLJb GDGCyI9mqDTkmP+oKFudUsWHG0rCROGhvdXRyU1dCpPQ/rgwN+d0sv59jsiwVF+8cnkmBKO yU6WHqwM+BO+RST+t2sdg== X-UI-Out-Filterresults: notjunk:1; V01:K0:KPeFrAS0K0I=:DoqTIvMsKoUr3inSIv+8vI pzJwhidrOSoSgg1b4swJ7QEAf5aqfX19y2/XJ8PeuBND8YaS5kYPlNPGh3Ndhnowq0a/o6qv7 tgl2SaPSVdk0INB1oJLZcOih8Iv6m/OecnCtxKWZMQ/UN/ZmL2NPUQkH20ViR2VjLlvG+qNEl yqtKQP8fiVpxl6BNpaZnuF6sja7xgDhuBlzTSUu1d2eVhzcJu9p/axhBi732NzK81uCoBhN+v ODL2RJP+n6llUSfT6fHxPKgCYpFFqlrlUMV7Vm4WFrO3nE1Zz6FoBcWedefILxACJ6kYjFLyY 82R6o5mbpy2LEi/hSgvQTIfRkiTAROiqPIUqip4A9N+UZlj8jhcbDOU3bjFHVjtZWeFTk3FbC OslbscHq8iFcUOiJ40H+GJytnjXcOWKryfho02S355uzgyNtKaZR59eMtMJXpn3mHyU+10Ldv GgYUMv8K0+Krv3P35gQAl4NSyoBxGbKLPCn2rUJJiNkE1cEnyu0B9CQluH1gQ2/9ml747IrXY dWv8bBEywj4sRbeY631SSk1MaIcSap/foaHi1DRg207WcdFo61CdJrhkzhPYt3bmQZaQ/FQ2m yz3z+BANEEaz53HanO5GRPYcDajWcuVemL1oT42LlC0VAo8a/JUiNc7E4ACHx+lOSZMyod7sD vB42JeqOGVrac137uw/P30dXD4NiDREIJLFA7UxNIitb1NLCBE/tnEiPkkFYM7FTKb0U= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the conntrack module contains code for ipv6, we can no longer have it built-in while IPv6 itself is a loadable module: net/netfilter/nf_conntrack_proto.o: In function `nf_ct_netns_do_get': nf_conntrack_proto.c:(.text+0x88c): undefined reference to `nf_defrag_ipv6_enable' net/netfilter/nf_conntrack_proto.o:(.rodata+0x178): undefined reference to `nf_conntrack_l4proto_icmpv6' This adds a dependency on IPv6 that makes it possible to still build the conntrack module with IPv6 disabled, but avoids the broken configuration. Fixes: 66c524acfb51 ("netfilter: conntrack: remove l3proto abstraction") Signed-off-by: Arnd Bergmann --- net/netfilter/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 74df382bf2ba..e42c38c99741 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -49,6 +49,7 @@ config NETFILTER_NETLINK_LOG config NF_CONNTRACK tristate "Netfilter connection tracking support" default m if NETFILTER_ADVANCED=n + depends on IPV6 || !IPV6 select NF_DEFRAG_IPV4 select NF_DEFRAG_IPV6 if IPV6 help