From patchwork Tue Oct 13 12:30:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1381554 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=LrQx2y9G; 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=VfSHodwR; 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 4C9ZhJ1wnjz9sRR for ; Tue, 13 Oct 2020 23:33:04 +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=mt3wZ/YNx0hZeuHeN+LhRYo0ZRP0oJvCgPUkZWbIhFA=; b=LrQx2y9Gdk9dcntUb5vxju3lR IyWRaURGs2XCjtBUpz4G+/96o6Pa/CDseXWzJIvyGtBdAUMgFsDymwWuZn24VYO8lJZiKAzyGrBLi EEdY6xyois/2xWVJcqkT0I4RUXag91OzFhNzC7WnklZgZilV0XNRV7uH0hpY8ccrB+id8je6HmDyo 64mq+Fy6cfkMMchIv+31y25fyfKnfLYJ6PAm3/xnE9FzDQQ9Q9/YUIfsM9wLkDWT9owgyEwGJvDAx egkygUnWKRsBQEwH6nf1J0PL99dc9+SH8iKX3hm3pc6y5y4TJ1CZE+Ly+qof1Kxcti0+JVapsANty uzvNsunoQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSJSZ-0004UR-L4; Tue, 13 Oct 2020 12:31:19 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSJSV-0004T7-0W for openwrt-devel@lists.openwrt.org; Tue, 13 Oct 2020 12:31:16 +0000 Received: by mail-pl1-x644.google.com with SMTP id d23so10612708pll.7 for ; Tue, 13 Oct 2020 05:31:14 -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=We7xTMKcqfyftBJfSEOvEI07X+ailYnOqZTYKukWJs8=; b=VfSHodwRUrkiFNbr78P+fkT2zHnfvDonxgDYorMJCpfKECgcB15fSOp4HLr1oJOgJs JdU49utR2DMJXr/x/34B3lbgOonmFSNra1cyHkEE9I2UsL2g3chuMP5+jMHlAiF18HUE o/zJxXGvA3yKDDbIYv+O9cSUx3zwF+YOg6Vo/RHPuQyipOJXJuIgMe0xuaUPh6MJbBUN WLVRqcm8B/8mX9HJasWPNCsu+n8+iQ+nDQCcmkKGSauzYmvmOKHTyN7UAQRYnqoduIS9 B2nYlK6wsXls6yCgc4DRdV/pkpSfUDOmPgaMkhI/9G2GYmuUgUeszPnnCDNtIRbOBVlb QjsQ== 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=We7xTMKcqfyftBJfSEOvEI07X+ailYnOqZTYKukWJs8=; b=BJ0sFVic+livqBWVDdyzG8CmKzBpFwwIAFJGykTxrxzbspHmmRpsvKMHW/vceBwiAO O9Ws5bixDp7HLFXy5DLUd385RO7pVm+2XdYBu9iUb2GVifeFtwML0d84RI2Y5Ho8mcn/ 9YabiecWM3SZuy5klnvubTbcZhKSPItS4q8Oh3ZiFpFoAkme7OH4whOO+nLWqmEG52UN O7izTN9iH/Vmi+01U7qiHQady1j8II5nXUKGyMaq3m0kLn16MD+oTaftxVgczjieAp7S fQwP9y1AGLVXbmyi5vNkmYh9hV4upnqEWhQwHbX0ShuSXJ/XRjVe9qOBo15dn3mPVW+6 o0Tg== X-Gm-Message-State: AOAM532QGr8OqZkMSX0xxyiYJ2SIMiHc49SynObpukRai+DDNyONU2XU 6vUjUwLUmR+pc51woAbHBLPgEP/YO6k= X-Google-Smtp-Source: ABdhPJwM75/xO7EuJ5NlRz2D3oT1famzs2aoPoOCdbD7NkEGHpUf7hrsiSR57iwPJoYmVfJl7o8cgA== X-Received: by 2002:a17:90a:8c02:: with SMTP id a2mr23921732pjo.186.1602592272443; Tue, 13 Oct 2020 05:31:12 -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.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Oct 2020 05:31:11 -0700 (PDT) From: Yousong Zhou To: openwrt-devel@lists.openwrt.org, Tony Ambardar Subject: [PATCH 7/7] netfilter.mk: add version conditional around CONFIG_NF_NAT_PROTO_GRE Date: Tue, 13 Oct 2020 20:30:47 +0800 Message-Id: <20201013123047.117135-8-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_083115_079135_D34CF621 X-CRM114-Status: GOOD ( 11.35 ) 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:644 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org It was removed in upstream linux commit faec18db ("netfilter: nat: remove l4proto->manip_pkt"). This happened since linux 5.1 Signed-off-by: Yousong Zhou --- include/netfilter.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/netfilter.mk b/include/netfilter.mk index dccec09ffb..0c29c0bd04 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -220,7 +220,7 @@ $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_BROADCAST, $(P_XT)nf $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_AMANDA, $(P_XT)nf_conntrack_amanda)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_AMANDA, $(P_XT)nf_nat_amanda)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CT_PROTO_GRE, $(P_XT)nf_conntrack_proto_gre, lt 5.1)) -$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_PROTO_GRE, $(P_V4)nf_nat_proto_gre)) +$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_PROTO_GRE, $(P_V4)nf_nat_proto_gre, lt 5.0)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_H323, $(P_XT)nf_conntrack_h323)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_H323, $(P_V4)nf_nat_h323)) $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_PPTP, $(P_XT)nf_conntrack_pptp))