From: Steven Barth <cyrus@openwrt.org>
Date: Thu, 9 Oct 2014 07:35:28 +0000 (+0000)
Subject: ppp: remove ugly ipv6-workaround
X-Git-Tag: reboot~5689
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=3f700643fa187fcaf953c5993f3deddf6546847b;p=openwrt%2F.git

ppp: remove ugly ipv6-workaround

This is not needed after all:

Omitting option ipv6 or setting it to 'auto' will
fire up a dhcpv6 subprotocol (this was added).

Setting ipv6 to 1 will only cause the IPv6 link to
be brought up and an accompanying dhcpv6 or static
interface with ifname @wan can be used to configure addresses.

Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 42859
---

diff --git a/package/network/services/ppp/files/lib/netifd/ppp-up b/package/network/services/ppp/files/lib/netifd/ppp-up
index 286fc5f834..fa14550ec4 100755
--- a/package/network/services/ppp/files/lib/netifd/ppp-up
+++ b/package/network/services/ppp/files/lib/netifd/ppp-up
@@ -19,12 +19,3 @@ proto_send_update "$PPP_IPPARAM"
 		[ -x "$SCRIPT" ] && "$SCRIPT" "$@"
 	done
 }
-
-if [ -n "$IPV6IFACE" -a "$(ifstatus $IPV6IFACE | jsonfilter -e @.device)" != "$IFNAME" ]; then
-	json_init
-	json_add_string name "${PPP_IPPARAM}_dhcpv6"
-	json_add_string ifname "@$PPP_IPPARAM"
-	json_add_string proto "dhcpv6"
-	json_close_object
-	ubus call network add_dynamic "$(json_dump)"
-fi