mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00
Code Issues Releases Wiki Activity

Revert "Merge branch 'test' into develop"

Browse source 
This reverts commit 9202d927bc, reversing
changes made to 0debb4036e.
This commit is contained in:
suyuan168 2021-12-29 01:43:08 +08:00
parent 6e841f266e
commit c861459e63
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config
View file

@ -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
CONFIG_PACKAGE_coreutils-stty=y

4
root/include/netfilter.mk
View file

@ -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
endif # __inc_netfilter