| Message ID | 20201013123047.117135-5-yszhou4tech@gmail.com |
|---|---|
| State | Superseded, archived |
| 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=v+qotl8A; 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=bxG3y6ck; 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 4C9ZhD5LHBz9sRR for <incoming@patchwork.ozlabs.org>; Tue, 13 Oct 2020 23:33:00 +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=M7el9IEG0daXgCRMp2oDHyFh//OeWD0hMxbtCmufaQ8=; b=v+qotl8Ax7bSOv362APL6SkXZ ykPAERsc8DETgtfi7LoMBXxEfMC3B19DjFg09YSQxss5OuoYBOOUZQh/NLSaS6SJzA3/1TOR6mshQ 2G10qFaC7Vd/R9dgVmPa3Q7WFTdTQGJEA652FzFauMJXuKuFGWe+7gtkRuBunumacsS//JO7yl/zt WBd4bk7b5cdl0ENFYCF4onW8s2VDtRGVHdAUT/2CnmJFxAevXN3Ky85Gf33BqEU2x2WMHcsbQ32H0 CPYy0AwGGrDyCLNmswmZfrnNr8Upjuxat3ISO3/vzyyvxy9iTzNrcfqtw1QKw4BnHWcMQXCjenosM SEViy6XBQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSJSR-0004Rt-1V; Tue, 13 Oct 2020 12:31:11 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSJSO-0004Qf-1H for openwrt-devel@lists.openwrt.org; Tue, 13 Oct 2020 12:31:08 +0000 Received: by mail-pf1-x443.google.com with SMTP id j18so4084350pfa.0 for <openwrt-devel@lists.openwrt.org>; Tue, 13 Oct 2020 05:31:07 -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=N0rtnSJMc5ZFtSjote7QnjYwZJGUZ+1bd0PNlLV7xG0=; b=bxG3y6ckBCJZnDE5IKqHY0vNY3MPXk9jhON/xyjGb/1/Kwyd7lB4VyKU6lxsyTu29s M+nWJhJ0uJD/S+2GjH/Cm3jaZJCdPE08zRLIUJfuOqSp9RV6e+uNzRjOBQb6bQtlbE8d YK98z7Zv/GZkdtlkLq2aIdg5vpMdxHBWrQ72anJvWTnAbYJ/4oZ1MMIax/6GYOhIPkhF ZK7xoX0oU7FmLV8ZQzGU50dSjhb+T9v4R2WeXMhqQBlrz4NkUbX0dS86rl+hYohupyQq vD2REMe4Y81sTFBjcjsCLG0oaXQILd8dlJThyMkXh8U1YXfVRZNjTuyKL8wdCLz5U+c4 8NxQ== 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=N0rtnSJMc5ZFtSjote7QnjYwZJGUZ+1bd0PNlLV7xG0=; b=U7e/DNGHTKv+IOikSBbsCPqUKHsAkE4rZbYUWRvrTzAG60DFa8znFK+ZFoYStsQlfG frcaiiCZUm7rpw/JQza0J5akieWCaPPF305gpukzdZ2ouXsImGJp3M7hlVzDEnopL+ra llPMmBSVAj7Nl9TiKh9q5lCikqkprCct5F9E3mN78W6oMKLLsfvyEt3DM6avVommKb3L T0sp9Cj275d9pQMvsMEP7Sllyj+/01/2WDRVCzbXCY8mPAvQ/dZkERHmNEiYVUdZ2a5d Cyz3HrpZqU/JfqCwCpB9DTx3A/sIPSjJk27UuJ7biOPYW9UdeTxNDjKZdRgEt5lbC8HJ evMw== X-Gm-Message-State: AOAM531ZZ6chzBmnsHgTpgUSpqD0pfvXP6s0aRnJ+39CoKnYLgx1WCaP eIsqv81fWbSPifp4XggqkFVOzB+btjg= X-Google-Smtp-Source: ABdhPJyU1uDXcAGkJrtyNEXgk77AzjIYaYNXBVvuN0GhbXUEtJGthaorsm/wOT6GAt9l4epJn0pa/w== X-Received: by 2002:a63:4d48:: with SMTP id n8mr17651410pgl.70.1602592266035; Tue, 13 Oct 2020 05:31:06 -0700 (PDT) Received: from titan.office.yunion.io ([103.119.177.162]) by smtp.gmail.com with ESMTPSA id t13sm23354657pfc.1.2020.10.13.05.31.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Oct 2020 05:31:05 -0700 (PDT) From: Yousong Zhou <yszhou4tech@gmail.com> To: openwrt-devel@lists.openwrt.org, Tony Ambardar <itugrok@yahoo.com> Subject: [PATCH 4/7] generic: 5.4: make nf nat masquerade in unset state by default Date: Tue, 13 Oct 2020 20:30:44 +0800 Message-Id: <20201013123047.117135-5-yszhou4tech@gmail.com> In-Reply-To: <20201013123047.117135-1-yszhou4tech@gmail.com> References: <20201013123047.117135-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201013_083108_209122_FD83A0BF X-CRM114-Status: GOOD ( 12.22 ) 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:443 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [yszhou4tech[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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> 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 aa3fbded3b..ebbff3fa62 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(-)