Message ID | 20201021071743.92801-3-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=1U7DJ2Md; 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=QO3xAqyS; 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 4CGMMZ1V4Lz9sTD for <incoming@patchwork.ozlabs.org>; Wed, 21 Oct 2020 18:20:09 +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=N738rCvU53cBRdGYDELLl0J4oBfUaJPkxlwVa4XQxKE=; b=1U7DJ2MdfA2raZcDhc9cVDegK Oll3EvlNCA/V2eZjhZZKc6YX26D6KVkvnK5B2hLs2+Os6xbbw1ngVt+Fye9Jxm+5IGQILYE+7GXch CyP4GYhYr7Id33YFWNjcF3E9+U34kN4XslIgxjmjMk97K59HO/aqBP6UUqyJLqmfkxtTegk0I44zq 7Gj/kyJr/mnYUPaBjBKGS+0M4qYJ63AwokUzwH36WtbBFxk4ipMVM4G6MlAARRGbGkPDEHk81FljB jxrkX4P0kMm1NTmV+vTqOOro+7XiK+EUGQJ7GwI4/+7Drit01NTxv2czfPGd0Adk7yDk4wUNIQVf2 NsGu3ZPbw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kV8Np-0007IV-Sv; Wed, 21 Oct 2020 07:18:05 +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 1kV8Nm-0007H6-FR for openwrt-devel@lists.openwrt.org; Wed, 21 Oct 2020 07:18:03 +0000 Received: by mail-pj1-x1044.google.com with SMTP id gv6so674622pjb.4 for <openwrt-devel@lists.openwrt.org>; Wed, 21 Oct 2020 00:18:02 -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=HY0sITZoKW0kUXnVPfIgfIWxVPv1jBMDeqpbSB2VX3A=; b=QO3xAqySu0Od6Dr6hQdw4sAlvXVBwL1o8mKJveYO8AXSv/0TuWfzB0TpXhG5Qb6ysQ pPUjI8OyAQd2u1JABOyohjG9gWkJmTAAJOv56+vCngwCrgNY+2Ndqw7Jb43xMXvHisSs mUtcSNujFhHRQZY4ImBWSgpvELGDVAHsnmc26jdvtaFocCW4ykfQipQxy1BqZWbva2Nn uGDlg117CELyqWKKTVNH7LJdXqodEwTrMTvQfdDMC+FkIP7K74oj/N49j9ycnIEv9eS9 jsseZePgZhXU93GNsWCm0K9KzkgkJcY36SsRjMLhtmjpSpsJZREFnZ1uxx1Sg5gDMMzl BfrA== 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=HY0sITZoKW0kUXnVPfIgfIWxVPv1jBMDeqpbSB2VX3A=; b=Sm8dzls/U5cH0sD33ltEn8Q4LHcNhQsIKQT60k1pFOJGNNMI4gQ4/w6OVvwo4FXp2g ZjftKhbaRmOiW5ZBFQXVzhG4/iHVDQOTzQ/2azk/Q0DC/zC0FgGHHDDiNU5Xs02g8hTg N5tzbN120Sp8y+RzOgfEoKZ/+Yvy/7d7dLq04J+JHUO1kMHDf9jpv44ufS959EKkrZ6y B9MXJfCKSAi8B1NWHhfrH9wyqjHGjgMhtK5JmaVBSZAJbf7WC8vgt6PqzBJRf0lSxCUR H5C9jj4L9o//7YIpjlFOg3of068x4c27vN1c41H5A2XZjiK8xEQSVoWpHtm0pe/eAv3P KxJw== X-Gm-Message-State: AOAM531SONHYCRf226Jd5r+aZiUhJAkYZe+1/9UWz1BtQhESAryQ5Vxy BMYFmG/3HzhzXzKq7v6RNrvulbtwwso= X-Google-Smtp-Source: ABdhPJyJRcHA0xanYA1BJDsnPC7NKgnEx+R5n2iWOQBFnnoyb11rRkkSUWNxUpXdE/5mICIj6/3xAw== X-Received: by 2002:a17:902:bd0c:b029:d4:ba5c:f37 with SMTP id p12-20020a170902bd0cb02900d4ba5c0f37mr1935324pls.56.1603264680471; Wed, 21 Oct 2020 00:18:00 -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.17.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2020 00:17:59 -0700 (PDT) From: Yousong Zhou <yszhou4tech@gmail.com> To: openwrt-devel@lists.openwrt.org, Tony Ambardar <itugrok@yahoo.com> Subject: [PATCH v2 2/8] netfilter.mk: use CONFIG_NETFILTER_XT_TARGET_REDIRECT Date: Wed, 21 Oct 2020 15:17:37 +0800 Message-Id: <20201021071743.92801-3-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_031802_539738_EDE5F5FB X-CRM114-Status: GOOD ( 11.32 ) 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/include/netfilter.mk b/include/netfilter.mk index 2047dcc842..9f22512d68 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -200,7 +200,7 @@ $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_NPT, ip6t_DN $(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_MASQUERADE, $(P_V4)ipt_MASQUERADE, lt 5.2)) $(eval $(call nf_add,IPT_NAT,CONFIG_NETFILTER_XT_TARGET_MASQUERADE, $(P_XT)xt_MASQUERADE, ge 5.2)) -$(eval $(call nf_add,IPT_NAT,CONFIG_IP_NF_TARGET_REDIRECT, $(P_XT)xt_REDIRECT)) +$(eval $(call nf_add,IPT_NAT,CONFIG_NETFILTER_XT_TARGET_REDIRECT, $(P_XT)xt_REDIRECT)) # nat-extra
CONFIG_IP_NF_TARGET_REDIRECT is a compat option since upstream commit 2cbc78a2 ("netfilter: combine ipt_REDIRECT and ip6t_REDIRECT"). That happened since linux 3.10 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> --- include/netfilter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)