From: Steven Barth <cyrus@openwrt.org>
Date: Tue, 29 Jan 2013 10:13:44 +0000 (+0000)
Subject: odhcp6c: remove IPv6 forwarding-sysctl workaround
X-Git-Tag: reboot~11454
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1a0b207d61cfbc2f7a2cf283482b1cfc1f5373fe;p=oweals%2Fopenwrt.git

odhcp6c: remove IPv6 forwarding-sysctl workaround

SVN-Revision: 35370
---

diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile
index 0d66272ef2..6ac2c67f72 100644
--- a/package/network/ipv6/odhcp6c/Makefile
+++ b/package/network/ipv6/odhcp6c/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=odhcp6c
-PKG_VERSION:=2013-01-28
+PKG_VERSION:=2013-01-29
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index f2161c2339..be91d16422 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -10,7 +10,6 @@ ipv6_conf() {
 prepare_interface() {
 	local device="$1"
 	ipv6_conf "$device" accept_ra 2
-	ipv6_conf "$device" forwarding 2
 
 	# Send RS
 	if [ -x /usr/sbin/6relayd ]; then
@@ -24,8 +23,7 @@ prepare_interface() {
 
 cleanup_interface() {
 	local device="$1"
-	ipv6_conf "$device" accept_ra 1
-	ipv6_conf "$device" forwarding 1
+	ipv6_conf "$device" accept_ra 0
 }
 
 setup_interface () {