From 682d280755ee7bd2140dca84b5ee21659a4ae580 Mon Sep 17 00:00:00 2001
From: David Wood <david@wood2.org.uk>
Date: Thu, 24 Dec 2015 05:50:16 +0000
Subject: [PATCH] Make ppp-ipv6 the only way interface_dhcpv6_configure() is
 called on PPP interfaces

---
 etc/inc/interfaces.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index b4254346e2..c1a1fd4ccd 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -3019,7 +3019,10 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
 	switch ($wancfg['ipaddrv6']) {
 	case 'slaac':
 	case 'dhcp6':
-		interface_dhcpv6_configure($interface, $wancfg);
+		// The ppp-ipv6 script calls interface_dhcpv6_configure() for PPP connections after IPv6CP is up
+		if (!interface_isppp_type($interface)) {
+			interface_dhcpv6_configure($interface, $wancfg);
+		}
 		break;
 	case '6rd':
 		interface_6rd_configure($interface, $wancfg);