[backfire] base-files, target: merge r28750 and r28933

[openwrt-10.03/.git] / package / base-files / files / etc / sysctl.conf

diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf
index 7c5396cde83deaa96ef1ce05e85b2f4b031870fe..9399971f308ea15e105a5c9ba61eaf4ebbe8dcf9 100644 (file)
--- a/package/base-files/files/etc/sysctl.conf
+++ b/package/base-files/files/etc/sysctl.conf
@@ -4,12 +4,11 @@ net.ipv4.conf.all.arp_ignore=1
 net.ipv4.ip_forward=1
 net.ipv4.icmp_echo_ignore_broadcasts=1
 net.ipv4.icmp_ignore_bogus_error_responses=1
-net.ipv4.tcp_ecn=1 
+net.ipv4.tcp_ecn=0
 net.ipv4.tcp_fin_timeout=30
 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
@@ -17,3 +16,8 @@ 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.ipv6.conf.all.forwarding=1
+
+# 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