From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932353AbbJPUK6 (ORCPT ); Fri, 16 Oct 2015 16:10:58 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:61949 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932106AbbJPUKz (ORCPT ); Fri, 16 Oct 2015 16:10:55 -0400 From: Arnd Bergmann To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, Patrick McHardy , Jozsef Kadlecsik , "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] netfilter: fix Kconfig dependencies for nft_dup_ipv{4,6} Date: Fri, 16 Oct 2015 22:10:04 +0200 Message-ID: <5041322.FiDa5XtNuO@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:iscrDD/dLIXl7AxMt11Id35YvVABmobTJHrqcQ6L5uvp/Pnr+qj 4B60URl3dnm6Jv2TOw+hZfSHf2qn9A8mlpEHFzsJGH9htbSeFymR5hwQ4uNECeaOR+vzIRr LOqx/ud5IbQ8dKO+j1hUDs7ywQ6v5LVGYOnjPgRfSfIiT0x/rgUKPIUQ3ILNgFlGianuQfc AvY9BIg0SIOW1HxRP9o/Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:0sABjc/wdio=:QO8/G2rW2QzETBALxGOMYk IYRFA28xmngpSODsfWrfO7y2eKLeb1r9/vUVxinv34NujcIsWYshhcxNTgiLQuHkDYqaMkmKd tgfGg3ChH087tqBdiX9vZxcw9rrjN/r/SXjCXsYy9KFjWn2iz2vQ4pvRFdLQfXyNtTKvcp9gq n3XeUGuBVYTTbPLqTOVzxJtdVd2p75+mTrSsfhh/mmIy//L9P61ETobl7fMaXvyy7jxLlGIzl krUwdLjY3ekm/LtttyXEY1+9hyD76+HTkyRIasdmf4KNA8QU7KpOrYWTpIR8UB1rlsEDtVH7Q 3SXTM/2dWLUZWi/W7QkTtb94+ca1qndD6mRePdossChR5zCc2D+FwsaNs5CgYQYfZLOuKTvE8 EjKeYzedzKKM4eoy68si3yaIs0Lt9WoXCoc0ZgCEgV4Hjb0zMbi2xn47yIX9cTybnz0N9aacw sdrMBfzabX2HQ2Tcze17jZ6VCy/1bYQ1dkaPAmtCkVjpBlgiOgoXWMqg8EmnI/f65EqNZhrUG 7Fjr6QEvpmW9ZLXiRzM3npoePnqQ1mbfoqq8sGm++26fpPqh+dsvMgLMvhDnnC3RH+u+I3gx1 wzl7ZhUAFRxujZNVnM8zosedJJitPp/g4RG9MYRck0TTVBBBLm6YIO9LXDX7MSTUl+O3dDD0M MJwq5YcPFlrso9GhUDBhKIhjuPjQifSocr4gMVIe9chF7q0wGL+QuucGnATc2u4kamoXrX9V1 kWuKyjvMMvZCn71N Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org nft_dup_ipv4 and nft_dup_ipv6 select the respective nf_dup_ipv{4,6} drivers, which must not be built-in if nf_conntrack is a loadable module, otherwise we get a link error: net/built-in.o: In function `nf_dup_ipv6': (.text+0xdef20): undefined reference to `nf_conntrack_untracked' The dependency was fixed for the nf_dup_* modules recently, but this patch adds the same dependency to the nft_dup_* modules for the (hopefully) complete fix. Signed-off-by: Arnd Bergmann Fixes: 6ece90f9a13e ("netfilter: fix Kconfig dependencies for nf_dup_ipv{4,6}") --- found on ARM randconfig builds diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index a35584176535..c187c60e3e0c 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig @@ -60,6 +60,7 @@ config NFT_REJECT_IPV4 config NFT_DUP_IPV4 tristate "IPv4 nf_tables packet duplication support" + depends on !NF_CONNTRACK || NF_CONNTRACK select NF_DUP_IPV4 help This module enables IPv4 packet duplication support for nf_tables. diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index f6a024e141e5..e10a04c9cdc7 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig @@ -49,6 +49,7 @@ config NFT_REJECT_IPV6 config NFT_DUP_IPV6 tristate "IPv6 nf_tables packet duplication support" + depends on !NF_CONNTRACK || NF_CONNTRACK select NF_DUP_IPV6 help This module enables IPv6 packet duplication support for nf_tables.