From 39df9ba501cad51b9ec244df73bd4e23c93d02a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Fri, 8 Jan 2021 20:55:25 +0100 Subject: [PATCH] fff-network: Remove relocated netfilter sysctls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The net.ipv4.netfilter.ip* sysctls have been moved to net.netfilter.nf* a long time ago, so they have been useless in our firmware for quite a while. It probably originally has been added because it was included in the OpenWrt defaults and in earlier versions of our firmware the OpenWrt defaults file got overwritten by our own one. Because there does not seem to be any obvious reason to keep them (they have been added without a comment in the commit or file) and they have been inactive ever since they were moved in the kernel, they are removed completely instead of using the correct path. Fixes: #42 (gitea) Signed-off-by: Fabian Bläse Reviewed-by: Christian Dresel --- .../fff/fff-network/files/etc/sysctl.d/50-fff-network.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/packages/fff/fff-network/files/etc/sysctl.d/50-fff-network.conf b/src/packages/fff/fff-network/files/etc/sysctl.d/50-fff-network.conf index a1db54a..a33c212 100644 --- a/src/packages/fff/fff-network/files/etc/sysctl.d/50-fff-network.conf +++ b/src/packages/fff/fff-network/files/etc/sysctl.d/50-fff-network.conf @@ -6,11 +6,6 @@ net.ipv4.tcp_ecn=0 net.ipv4.tcp_fin_timeout=30 net.ipv4.tcp_keepalive_time=120 net.ipv4.tcp_syncookies=1 -net.ipv4.netfilter.ip_conntrack_checksum=0 -net.ipv4.netfilter.ip_conntrack_max=16384 -net.ipv4.netfilter.ip_conntrack_tcp_timeout_established=3600 -net.ipv4.netfilter.ip_conntrack_udp_timeout=60 -net.ipv4.netfilter.ip_conntrack_udp_timeout_stream=180 net.core.netdev_max_backlog=30 net.netfilter.nf_conntrack_checksum=0