From: Steven Barth <cyrus@openwrt.org>
Date: Fri, 9 May 2014 13:55:34 +0000 (+0000)
Subject: netifd: Fix nested protocols going offline at reload + various route issues
X-Git-Tag: v19.07.0-rc1~17927
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0c06d76c79e6d24f6ea46952504b3938d6d298e6;p=openwrt%2Fstaging%2Fhauke.git

netifd: Fix nested protocols going offline at reload + various route issues

Much thanks to Hans Dedecker

SVN-Revision: 40746
---

diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
index 0f09059ad5..3c78202e9b 100644
--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netifd
-PKG_VERSION:=2014-05-02
+PKG_VERSION:=2014-05-09
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://git.openwrt.org/project/netifd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=023db1ca8f352a646700f2d60c397fb89492f4c8
+PKG_SOURCE_VERSION:=8714f17ad66fa29383170ad45b9c150b9818dbdf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 # PKG_MIRROR_MD5SUM:=
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index 8746633277..7a7f76f833 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -92,7 +92,6 @@ setup_interface () {
 		[ -n "$IFACE_DSLITE_DELEGATE" ] && json_add_boolean delegate "$IFACE_DSLITE_DELEGATE"
 		json_close_object
 		ubus call network add_dynamic "$(json_dump)"
-		ifup "$IFACE_DSLITE"
 	fi
 
 	MAPTYPE=""
@@ -121,7 +120,6 @@ setup_interface () {
 		[ -n "$IFACE_MAP_DELEGATE" ] && json_add_boolean delegate "$IFACE_MAP_DELEGATE"
 		json_close_object
 		ubus call network add_dynamic "$(json_dump)"
-		ifup "$IFACE_MAP"
 	fi
 
 	# TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN