[openwrt/openwrt] netfilter.mk: add version conditional around CONFIG_NF_NAT_PROTO_GRE

LEDE Commits lede-commits at lists.infradead.org
Sat Oct 24 10:43:17 EDT 2020


yousong pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/2407118db9adfd4e42be2fa8f1165d30abee007a

commit 2407118db9adfd4e42be2fa8f1165d30abee007a
Author: Yousong Zhou <yszhou4tech at gmail.com>
AuthorDate: Fri Oct 9 17:22:04 2020 +0800

    netfilter.mk: add version conditional around CONFIG_NF_NAT_PROTO_GRE
    
    It was removed in upstream linux commit faec18db ("netfilter: nat:
    remove l4proto->manip_pkt").  This happened since linux 5.0
    
    Signed-off-by: Yousong Zhou <yszhou4tech at gmail.com>
---
 include/netfilter.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/netfilter.mk b/include/netfilter.mk
index 8776391f96..02173d4355 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))



More information about the lede-commits mailing list