From patchwork Wed Oct 21 07:17:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1385381 X-Patchwork-Delegate: yszhou4tech@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=IsYbXnt5; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YNIN2sHk; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGMMm5ZYFz9sPB for ; Wed, 21 Oct 2020 18:20:20 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=37N6quvi4xXUvmLKd3kr04vBU7We9Hh4NYmgl4+qLHw=; b=IsYbXnt59dsjZzvf5MGAC2ZYl EZVb4A9LLnhDnPB9jM1OSMMfzT2mXDgt1VSCWAtYWb7dpevkfwMOXyF354r2SjgawSbfb8jg+oV7Z 0y/Ichq2Cxl3gg2i6F+kWFlgDjm/XtOGX882Hc7cZn0Y/Ga8qj2OmgZqdjUCriVZagH2xEJcr2nwC z20cEEKvEBMJ2RfdaYNqAqeeFusUMrm+2mpb3AVfYdDqDl+8fOzE497qTniGdGMhmpTuAobhuh+TC G5CHHSF+MToxVcJ4gPLoGgCRJY3OeXgGISE/GrlWPJPnpVaZVmN5Sx/p6mMBjab0szTKVGpjY4Guu WRgL6OYLQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Ns-0007JM-I2; Wed, 21 Oct 2020 07:18:08 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Np-0007Hu-4r for openwrt-devel@lists.openwrt.org; Wed, 21 Oct 2020 07:18:06 +0000 Received: by mail-pl1-x643.google.com with SMTP id 1so767035ple.2 for ; Wed, 21 Oct 2020 00:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=466I0UXDVso6JihS9MOj4cIXA3vfNod2ES8veq56zh4=; b=YNIN2sHk/04l6tgk/nkxSWcaYDDxVMYwT/TMa1gRebFx/6BBEJ1MPpU7XvY+UypyGO tGvhdgz4VV53CEmFhDf44Dc0q3LdbYtETWzNMRNijSkzQ6Olf7yVsWTdfsclmnVlE9e6 XUPqozzGnbjAKe5fPeTFFLLktiFIuTS201sfaNTTliikPUSSjCTMZkMaihA7vloB98kS n5/hwQvmA33po9ySRNBP+fd8wcxmS0CRFapkT4UAEWZGmxC4TIZgJI3L/oHGRE8gGz5z nxpe3EEB4479nlCNrhrDDU0Mn3NK7XzgBCHpsh9AuNNtjBLrWphrwU0AFuKNmCzMLHgp kGOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=466I0UXDVso6JihS9MOj4cIXA3vfNod2ES8veq56zh4=; b=QQ8oLV5l7C5wXWg7QJeH5KJbb1hR6uuuOkAlQB71/BarSylVs2X2+Vp9CCY7QPTdOJ 4n+HwDIcmnBjoFn3iWNfLy28q8K3hb32oFunC1m2YIccKmNQGqy1KU1rxFtDFoPuPe0K P/bm2IkCWmB8ogRhQb0Hac2u5xd7VAArVYb8LNZoFBBJva2IVfzHS6SLHGAW2fvOd94K nCvxMUn4Wkz/b/U0sDjbRtRoeT1Gw+EX4jUA1qzpOYgJ+Kq4+ULYL4+k28c5VAb2gNVV kQ2h6F6mYHizSet1Sx62zC9hMfjCZTkWbLD0mUdH5jPbv0x12dcn7aQ3GfR8PhGzhwu0 mmLg== X-Gm-Message-State: AOAM530sfSPLT14TA6b84Nl9YMJ/LhktgeKUCC3nF9i7zE5XpL+dNgLC m0GNSPo4Duv+URyR0KveSNy7kLvihXY= X-Google-Smtp-Source: ABdhPJzDYS4f5q4t7C18EJDAVf4ISHvWutiIiaZ7IjiAio5nK2FAL4zy8Ot5N/TRMcaINj8ASLWPlA== X-Received: by 2002:a17:902:bcc1:b029:d3:9bdf:32e3 with SMTP id o1-20020a170902bcc1b02900d39bdf32e3mr1901012pls.1.1603264682703; Wed, 21 Oct 2020 00:18:02 -0700 (PDT) Received: from titan.office.yunion.io ([103.119.177.162]) by smtp.gmail.com with ESMTPSA id r201sm1270730pfc.98.2020.10.21.00.18.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2020 00:18:02 -0700 (PDT) From: Yousong Zhou To: openwrt-devel@lists.openwrt.org, Tony Ambardar Subject: [PATCH v2 3/8] netfilter.mk: add version conditional for nf_nat_ipv4, 6 Date: Wed, 21 Oct 2020 15:17:38 +0800 Message-Id: <20201021071743.92801-4-yszhou4tech@gmail.com> In-Reply-To: <20201021071743.92801-1-yszhou4tech@gmail.com> References: <20201021071743.92801-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201021_031805_254731_44981D39 X-CRM114-Status: GOOD ( 11.48 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:643 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yszhou4tech[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou , Adrian Schmutzler Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The upstream linux commit is 3bf195ae ("netfilter: nat: merge nf_nat_ipv4,6 into nat core"). It was included since linux 5.1 Signed-off-by: Yousong Zhou --- include/netfilter.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/netfilter.mk b/include/netfilter.mk index 9f22512d68..3c217db106 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -185,8 +185,8 @@ $(eval $(call nf_add,IPT_IPV6_EXTRA,CONFIG_IP6_NF_MATCH_RT, $(P_V6)ip6t_rt)) # kernel only $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT, $(P_XT)nf_nat),)) $(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_REDIRECT, $(P_XT)nf_nat_redirect),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_IPV4, $(P_V4)nf_nat_ipv4),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT6,CONFIG_NF_NAT_IPV6, $(P_V6)nf_nat_ipv6),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT,CONFIG_NF_NAT_IPV4, $(P_V4)nf_nat_ipv4, lt 5.1))) +$(eval $(if $(NF_KMOD),$(call nf_add,NF_NAT6,CONFIG_NF_NAT_IPV6, $(P_V6)nf_nat_ipv6, lt 5.1))) $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_NETFILTER_XT_NAT, $(P_XT)xt_nat),)) $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT,CONFIG_IP_NF_NAT, $(P_V4)iptable_nat),))