| Message ID | 20201021071743.92801-5-yszhou4tech@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Yousong Zhou |
| Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> 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=<UNKNOWN>) 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=i5v4iyk6; 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=L7+Qw5pp; 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 4CGMMv4xr8z9sTD for <incoming@patchwork.ozlabs.org>; Wed, 21 Oct 2020 18:20:27 +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=YYTinwLWuC8kOKRp2a5rcOnG2ad4NTAcj0QMBrR0zKU=; b=i5v4iyk6u+3v1jSCCImWDH2Jg bHDM8FovpeO9Sof8SiJAsW2mLdoIbffrmHvFH7sPeBerfuSzfjmzx7S/H8tZglL6fph4Wr6DOpPPs NSpX6Y4vn8CamN6txWr/Kz2liZlhhooBG81T/thBAOeRnhg0YSNlpQAVyv3XaTDJLEcoA6Irdj1Q6 G9T2jvM4gQbHh4I45YHaIIFQOikkQn7CHi35kSxyZjZMX0jaEmpo6TH1Uxl+GJVvOaoEE+zuzFP3R qw4YqKa/q5Q1KdruV8CH5xhnVPt+GF6s91xCeMSbbxWCvV6YU42Fo4dNHeRWb3fvEMqrsS+GGTcTj ZJRK/X2xw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Nw-0007KO-AX; Wed, 21 Oct 2020 07:18:12 +0000 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Nr-0007Ip-5h for openwrt-devel@lists.openwrt.org; Wed, 21 Oct 2020 07:18:08 +0000 Received: by mail-pj1-x1044.google.com with SMTP id k8so32173pjd.0 for <openwrt-devel@lists.openwrt.org>; Wed, 21 Oct 2020 00:18:06 -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=1wkZDhYATOwAPYhwd1Wg4TI6n5JJU5lMOuhYcvwcIiA=; b=L7+Qw5ppRBJqb5EqAwrizISqiH8NMM6Z0zbOvSuzxDsf3ZEEXnYaVvgvyLE7d9b14/ FgAYKjubWfvnSUVtCUSrHW9RiUzr3DNlEinaMekEWPevWoTS82PKslXhN13cvRFocR9+ ehsiEk3f1MgK1DOTDjvXE9231bIY3CX65jDE9Ef7E8H9bM+WDvzlLxXcn7ZInsR9zVKT maSIyQ4qodalDLdjx2Dg87WnayiejSwlRdOU7lYCxV7lQ4tBIXdFzSC4LSUlDc29uilF Zyai3/1LVqlCQPgF9F4R7Q8tR0XZStCv9vk82RcxZpZjGsM9eaOA//9um8GwTH5L8pqq 7HEQ== 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=1wkZDhYATOwAPYhwd1Wg4TI6n5JJU5lMOuhYcvwcIiA=; b=AQN2nkV/vmTmYVTy0cCZ/Q9+f2aAfMwW0Rg4N5zJM046/XAvRHN0KqusHQoioasuAH NYSOXhRNQKL+w8cnDqvZ4N7Ti9IVwP0exk2LxkngTIGimoUPrpCTEjnhXacTPLgsaUxw FR89y8tCBdfzaNybey9VdlS2fowqH6kc1RGLiGkXziei4M2GI4J04wOdvIfJ1zGV29qw AVLspdD0GLAcT6Fz8TH8LkSzGlQx0j5ZJbNx/KmimMKAOsq5uCZhr+IS2XTD+dTDCr4T QHvXrc3liv6cejX0nOdaYVPM/2lJlAfMFiUSSmdE9JXNnT0F6LLjb8XbrREm6oq0AH27 cCsw== X-Gm-Message-State: AOAM532mH9yn+2Wy8iSv8INZhIRJEwRqXJtgqW6h871r8z1yQ4C8yHBH trLwDokWWq96iqcbFI38MXoR3xA1yx4= X-Google-Smtp-Source: ABdhPJwiQ0Rp9PvHyFazttpVvyQMNoVb+TWpvfpi0p6ipU/i7e4RtUCxgQ6ft8ii+uVPYkqirDmXNw== X-Received: by 2002:a17:90a:450d:: with SMTP id u13mr2010407pjg.148.1603264684962; Wed, 21 Oct 2020 00:18:04 -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.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2020 00:18:04 -0700 (PDT) From: Yousong Zhou <yszhou4tech@gmail.com> To: openwrt-devel@lists.openwrt.org, Tony Ambardar <itugrok@yahoo.com> Subject: [PATCH v2 4/8] generic: 5.4: make nf nat masquerade in unset state by default Date: Wed, 21 Oct 2020 15:17:39 +0800 Message-Id: <20201021071743.92801-5-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_031808_138373_D629CF4D X-CRM114-Status: GOOD ( 12.36 ) 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:1044 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 <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <https://lists.openwrt.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.openwrt.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <https://lists.openwrt.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Cc: Yousong Zhou <yszhou4tech@gmail.com>, Adrian Schmutzler <mail@adrianschmutzler.de> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
| Series |
netfilter: kconfig symbol updates
|
expand
|
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index 04fda5de24..b911efdf4e 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -3689,8 +3689,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y # CONFIG_NF_NAT_H323 is not set # CONFIG_NF_NAT_IPV6 is not set # CONFIG_NF_NAT_IRC is not set -CONFIG_NF_NAT_MASQUERADE_IPV4=y -CONFIG_NF_NAT_MASQUERADE_IPV6=y +# CONFIG_NF_NAT_MASQUERADE is not set # CONFIG_NF_NAT_NEEDED is not set # CONFIG_NF_NAT_PPTP is not set # CONFIG_NF_NAT_PROTO_GRE is not set
Upstream linux 5.1 commit d1aca8ab ("netfilter: nat: merge ipv4 and ipv6 masquerade functionality") replaces the following 2 options - CONFIG_NF_NAT_MASQUERADE_IPV4 - CONFIG_NF_NAT_MASQUERADE_IPV6 with CONFIG_NF_NAT_MASQUERADE. The new option is one without prompt and will be selected by CONFIG_NETFILTER_XT_TARGET_MASQUERADE introduced still later in 5.2. Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> --- target/linux/generic/config-5.4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)