From: cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 11 Jun 2013 13:32:07 +0000 (+0000)
Subject: AA: base-files: backport r36918
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=8509ba88ee394a07712cc9db31eca679a98b4433;p=12.09%2Fopenwrt.git

AA: base-files: backport r36918

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36919 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index b012b80..ee1deea 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=118
+PKG_RELEASE:=118.1
 
 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 890e77a..89527df 100644
--- a/package/base-files/files/etc/sysctl.conf
+++ b/package/base-files/files/etc/sysctl.conf
@@ -12,8 +12,8 @@ net.ipv4.tcp_timestamps=1
 net.ipv4.tcp_sack=1
 net.ipv4.tcp_dsack=1
 
-net.ipv6.conf.default.forwarding=2
-net.ipv6.conf.all.forwarding=2
+net.ipv6.conf.default.forwarding=1
+net.ipv6.conf.all.forwarding=1
 
 net.netfilter.nf_conntrack_acct=1
 net.netfilter.nf_conntrack_checksum=0