From 6ea19a20b786ef6b83dfd4391def7156ba7af936 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Wed, 1 Jul 2020 17:05:30 +0800 Subject: [PATCH] kernel: revert some config --- package/kernel/linux/files/sysctl-br-netfilter.conf | 6 +++--- package/kernel/linux/files/sysctl-nf-conntrack.conf | 3 ++- package/kernel/linux/modules/crypto.mk | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/kernel/linux/files/sysctl-br-netfilter.conf b/package/kernel/linux/files/sysctl-br-netfilter.conf index b10ddc087..22c24a4bf 100644 --- a/package/kernel/linux/files/sysctl-br-netfilter.conf +++ b/package/kernel/linux/files/sysctl-br-netfilter.conf @@ -2,6 +2,6 @@ # /etc/sysctl.conf can be used to customize sysctl settings # disable bridge firewalling by default -net.bridge.bridge-nf-call-arptables=0 -net.bridge.bridge-nf-call-ip6tables=0 -net.bridge.bridge-nf-call-iptables=0 +net.bridge.bridge-nf-call-arptables=1 +net.bridge.bridge-nf-call-ip6tables=1 +net.bridge.bridge-nf-call-iptables=1 diff --git a/package/kernel/linux/files/sysctl-nf-conntrack.conf b/package/kernel/linux/files/sysctl-nf-conntrack.conf index 37baf5fd6..2af8cfb8c 100644 --- a/package/kernel/linux/files/sysctl-nf-conntrack.conf +++ b/package/kernel/linux/files/sysctl-nf-conntrack.conf @@ -3,7 +3,8 @@ net.netfilter.nf_conntrack_acct=1 net.netfilter.nf_conntrack_checksum=0 -net.netfilter.nf_conntrack_max=16384 +net.netfilter.nf_conntrack_max=65535 net.netfilter.nf_conntrack_tcp_timeout_established=7440 net.netfilter.nf_conntrack_udp_timeout=60 net.netfilter.nf_conntrack_udp_timeout_stream=180 +net.netfilter.nf_conntrack_helper=1 diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 900172179..caad018d8 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -281,7 +281,7 @@ endef KernelPackage/crypto-ghash/imx6=$(KernelPackage/crypto-ghash/arm-ce) KernelPackage/crypto-ghash/ipq40xx=$(KernelPackage/crypto-ghash/arm-ce) -KernelPackage/crypto-ghash/mvebu/cortexa9=$(KernelPackage/crypto-ghash/arm-ce) +KernelPackage/crypto-ghash/mvebu=$(KernelPackage/crypto-ghash/arm-ce) $(eval $(call KernelPackage,crypto-ghash))