From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 18 Jan 2010 05:38:44 +0000 (+0000)
Subject: base-files: disable bridge firewalling by default
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bf9917d651fafcaff69b412b71c5c2a80c601d6e;p=openwrt%2Fstaging%2Frobimarko.git

base-files: disable bridge firewalling by default

SVN-Revision: 19214
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index ea2b5a47f1..fb30b94ab9 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2009 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=35
+PKG_RELEASE:=36
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf
index 63497beb1c..759752ae5e 100644
--- a/package/base-files/files/etc/sysctl.conf
+++ b/package/base-files/files/etc/sysctl.conf
@@ -4,7 +4,7 @@ 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=0 
+net.ipv4.tcp_ecn=0
 net.ipv4.tcp_fin_timeout=30
 net.ipv4.tcp_keepalive_time=120
 net.ipv4.tcp_syncookies=1
@@ -17,3 +17,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