From patchwork Mon Jul 9 15:25:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 141430 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2797238ljj; Mon, 9 Jul 2018 08:26:11 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc1Uw2H7qJSpxN97+GVfpmrzCCx+5FWxEamnab/qgSKeL7mpu3c4tSPvckjDxyAqyQdWk6U X-Received: by 2002:a63:920c:: with SMTP id o12-v6mr19304901pgd.233.1531149971379; Mon, 09 Jul 2018 08:26:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531149971; cv=none; d=google.com; s=arc-20160816; b=s12xWmH92BJGK+8peiIqJgh08gh67CWn6Dx3tRMKnxr88iNZjGK+6mzuf1jTNcmeQZ 1b3JAH9agNumz8ZFXDgKD+xDwHA4jc8Cg5eElOuRnSobejTpXBXh2ztHf9Tc4gVz+v/+ h0HUVkdvaqUWsop2/w9YmuPKQ5fupG7bm/NC5gH1TyOZcZdfAFiTaLzMML4yjRkkC2si qyyPmcjgk76ZL17DkWqh86zXMBkttLGcVI8YZmOAUH9bXwasU13LzSQEt65dc2xRoMSE Dj7AZSBKJPnp5kxwlRkkljaoPdV3FaHaXx5DEp5tiMMWcWZXUk8XbapXZEUKihY2cFvm rkSw== 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=FOpy2k7ZhPt8wHrogd41xfiJFj1ICdWBhwo7C1cuHrc=; b=aQ6gsZusE/meY3Y/Z0WgPQNIU7Z7BuEFb22Drj3pmF5RgLiCf1dAl7JfTPdXJ0Ulyo sRz0mDIvOoffRNFd0a/uxjlhVqle5/6IMwH51J3QjXsacQHGmNaKpA8N+rRiU7WlyFlR 0GiSsveejpV4d07x1hprjz3SHt/BBPxI79NJKWM/aaPa1P492vyFCaXSc/6vbsC/rrep FTVC/OXgdVbTWNhujuSbslloF4UOyjpanBHudlb12cE1Din/12j57YTjx3B+6Ew+OH5b w7H/mD72E7lkEiMSbrl+zbygaEs6Z0MqWHWS+mVaqE6fdrHaYr3YMhN/0kYcdgKif7FX XpJg== 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 cd5-v6si15203062plb.174.2018.07.09.08.26.11; Mon, 09 Jul 2018 08:26:11 -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 S933504AbeGIP0J (ORCPT + 30 others); Mon, 9 Jul 2018 11:26:09 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:41293 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933081AbeGIP0H (ORCPT ); Mon, 9 Jul 2018 11:26:07 -0400 Received: from wuerfel.lan ([46.223.138.35]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0M6ydl-1fzQ7615W9-00wjXw; Mon, 09 Jul 2018 17:25:49 +0200 From: Arnd Bergmann To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" Cc: Arnd Bergmann , Kirill Tkhai , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] netfilter: xt_tee: fix calling nf_dup_ipv6 Date: Mon, 9 Jul 2018 17:25:38 +0200 Message-Id: <20180709152546.1177277-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:Zyi2ggLT3WyHCKTfDvyP0aV4IAzy86gcDwzL/vd4Bp8w6uLG5f+ a1ZLCiVAY1xahuuuNLawJKKok5ckcz0JkQ6MNabDddhP5uo288vRpzZxUeCJm3ScKIeNdNw C+1j1YJKcxcy7mNxhW4XBIfeLas9vPMxrMxRG9Y8bWeXbzCxODt6mHseX8Zcxq+s/BD2g7E jXOV/yBmlH9x9XT1SB35A== X-UI-Out-Filterresults: notjunk:1; V01:K0:jlJz5we5ZuQ=:QUnvjEF96KM0pJV6y1kWsc qvAJyvbDwccr4l5/EWRjU7fM3j4hKMS8jeNe0rYlFsGLN6Hk6CQ0a6ktefDgf2s5fI9L5OZ6n Y/UTn6xkZ4n/VE+WHHU18RNgqP08r8z5+5/IxGuoO3MVzmKodBBAc+Dt5D0EjNI1H4bYFC4/7 xa9h+OWR0zJ0jMuYiwQgd30IRFgqhdHKU3PhJXou41h6/ajUU/2NkMzPOUdzQzBbh8fsMAGc9 QnQ7wJmyfWcGvZPznfghB2wTNelY9hAucqTSK0y/oeEbSyM7BcmgXEkQVr9hg8AuUxlNmyvEQ Nq+gfCyaX/bBd5Qf1CS/ZYhRCbopVv3fTXVcgDVz+kZF56o6xChZfSigG/tavGyet6hro7Dav T/TwIkQS0ol9NGGJhLa1IjT9evo102f3DHIlj8/dJ+fLwb885lNHITlSwVmbH/TtzJkDvJuv3 7uYBYjJblHzy40ojr9rRJinNsLkFDPw5FkDqzYipiQPI8Xtmzow5yGZk5/3fnisChgE0RvP4Q 4IRudDKt/sXCgVl7gLTpoSIStQcYPiFP3v1pnotnxX6u5L+7hifQmtSUO3LzIkJdF4kuSifQc EurKLF/ztYvNoxAmSEmdWQorcBSI1AjlQrv9YHP1+knEV/4f+Jwtmqz8M5OsnsVoqIXlRbGCf +nRDEim/K+dkuzDdQxyhfj+kBIcR7u8iFOKeak5HY5cTd8zQ9QhDCsghBD0jEqX9HyGw= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that we can enable the NETFILTER_XT_TARGET_TEE option without supporting TEE on ipv6, we get a build error with NETFILTER_XT_TARGET_TEE=y, IPV6=y and IP6_NF_IPTABLES=n: ERROR: "nf_dup_ipv6" [net/netfilter/xt_TEE.ko] undefined! I previously submitted another patch that fixes the same symptom for the case of IP6_NF_IPTABLES=m, but missed the fact that there are still similarly broken configurations. Fixes: 35bf1ccecaaa ("netfilter: Kconfig: Change IPv6 select dependencies") Signed-off-by: Arnd Bergmann --- net/netfilter/xt_TEE.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/net/netfilter/xt_TEE.c b/net/netfilter/xt_TEE.c index 475957cfcf50..0d0d68c989df 100644 --- a/net/netfilter/xt_TEE.c +++ b/net/netfilter/xt_TEE.c @@ -38,7 +38,7 @@ tee_tg4(struct sk_buff *skb, const struct xt_action_param *par) return XT_CONTINUE; } -#if IS_ENABLED(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) static unsigned int tee_tg6(struct sk_buff *skb, const struct xt_action_param *par) { @@ -141,7 +141,7 @@ static struct xt_target tee_tg_reg[] __read_mostly = { .destroy = tee_tg_destroy, .me = THIS_MODULE, }, -#if IS_ENABLED(CONFIG_IPV6) +#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) { .name = "TEE", .revision = 1,