From c861459e63a0e4f291f690f2590b8826ab3ee920 Mon Sep 17 00:00:00 2001 From: suyuan168 <175338101@qq.com> Date: Wed, 29 Dec 2021 01:43:08 +0800 Subject: [PATCH] Revert "Merge branch 'test' into develop" This reverts commit 9202d927bc3bd8b36a50a11eb54c8551a8573fe6, reversing changes made to 0debb4036e1add6b3179499cc75b37490d3a089d. --- config | 5 ++--- root/include/netfilter.mk | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/config b/config index f4d088e0..ab7ca845 100755 --- a/config +++ b/config @@ -215,7 +215,6 @@ CONFIG_KERNEL_MPTCP_IPV6=y CONFIG_KERNEL_CRYPTO_SHA256=y CONFIG_LUCI_LANG_en=y CONFIG_LUCI_LANG_zh_Hans=y -CONFIG_LUCI_LANG_zh_Hant=y CONFIG_LUCI_LANG_zh-tw=y CONFIG_TARGET_ROOTFS_PARTSIZE=512 CONFIG_TARGET_KERNEL_PARTSIZE=64 @@ -227,7 +226,7 @@ CONFIG_KERNEL_DEVMEM=y CONFIG_KERNEL_DEVKMEM=y CONFIG_AUTOREMOVE=y # CONFIG_PACKAGE_kmod-sound-core is not set -# CONFIG_PACKAGE_kmod-video-core is not set +# CONFIG_PACKAGE_kmod-video-core is not set CONFIG_PACKAGE_luci-theme-argon=y CONFIG_PACKAGE_luci-theme-bootstrap=y CONFIG_PACKAGE_luci-theme-openwrt-2020=y @@ -240,4 +239,4 @@ CONFIG_PACKAGE_minicom=y CONFIG_PACKAGE_irqbalance=y CONFIG_PACKAGE_mtr=y CONFIG_PACKAGE_sysstat=y -CONFIG_PACKAGE_coreutils-stty=y \ No newline at end of file +CONFIG_PACKAGE_coreutils-stty=y diff --git a/root/include/netfilter.mk b/root/include/netfilter.mk index d5b22aec..2da459f3 100644 --- a/root/include/netfilter.mk +++ b/root/include/netfilter.mk @@ -157,7 +157,7 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NF_CONNTRACK,CONFIG_NF_DEFRAG_IPV6, $(P_V6) $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_FILTER, $(P_V6)ip6table_filter),)) $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MANGLE, $(P_V6)ip6table_mangle),)) -$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_NF_LOG_IPV6, $(P_V6)nf_log_ipv6,lt 5.13),)) +$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_NF_LOG_IPV6, $(P_V6)nf_log_ipv6),lt 5.13)) $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_IPTABLES, ip6t_icmp6))) @@ -384,4 +384,4 @@ IPT_BUILTIN += $(EBTABLES_IP4-y) IPT_BUILTIN += $(EBTABLES_IP6-y) IPT_BUILTIN += $(EBTABLES_WATCHERS-y) -endif # __inc_netfilter \ No newline at end of file +endif # __inc_netfilter