aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-03-17 15:35:41 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-03-17 15:35:41 +0000
commit629e73938eae1add67c2cbfdd62672f529422045 (patch)
tree64ff29f063584b47fa13db84e04e56b0573d7b66
parent6b0faf40e7f9ccd8c43a1c921887744ca683ed1f (diff)
downloadupstream-629e73938eae1add67c2cbfdd62672f529422045.tar.gz
upstream-629e73938eae1add67c2cbfdd62672f529422045.tar.bz2
upstream-629e73938eae1add67c2cbfdd62672f529422045.zip
base-files: update sysctl.conf for modern kernels
SVN-Revision: 26204
-rw-r--r--package/base-files/Makefile4
-rw-r--r--package/base-files/files/etc/sysctl.conf8
2 files changed, 9 insertions, 3 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 60f9f83b5c..5f8a3eaab4 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2007-2010 OpenWrt.org
+# Copyright (C) 2007-2011 OpenWrt.org
# Copyright (C) 2010 Vertical Communications
#
# This is free software, licensed under the GNU General Public License v2.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files
-PKG_RELEASE:=66
+PKG_RELEASE:=67
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf
index 6da43d0917..40ce77dff3 100644
--- a/package/base-files/files/etc/sysctl.conf
+++ b/package/base-files/files/etc/sysctl.conf
@@ -10,7 +10,7 @@ net.ipv4.tcp_keepalive_time=120
net.ipv4.tcp_syncookies=1
net.ipv4.tcp_timestamps=0
net.core.netdev_max_backlog=30
-net.netfilter.nf_conntrack_checksum=0
+
net.ipv4.netfilter.ip_conntrack_checksum=0
net.ipv4.netfilter.ip_conntrack_max=16384
net.ipv4.netfilter.ip_conntrack_tcp_timeout_established=3600
@@ -18,6 +18,12 @@ net.ipv4.netfilter.ip_conntrack_udp_timeout=60
net.ipv4.netfilter.ip_conntrack_udp_timeout_stream=180
net.ipv6.conf.all.forwarding=1
+net.netfilter.nf_conntrack_checksum=0
+net.netfilter.nf_conntrack_max=16384
+net.netfilter.nf_conntrack_tcp_timeout_established=3600
+net.netfilter.nf_conntrack_udp_timeout=60
+net.netfilter.nf_conntrack_udp_timeout_stream=180
+
# disable bridge firewalling by default
net.bridge.bridge-nf-call-arptables=0
net.bridge.bridge-nf-call-ip6tables=0