diff options
| author | David Wood <david@wood2.org.uk> | 2015-12-24 05:50:16 +0000 |
|---|---|---|
| committer | David Wood <david@wood2.org.uk> | 2016-01-06 02:23:54 +0000 |
| commit | 682d280755ee7bd2140dca84b5ee21659a4ae580 (patch) | |
| tree | a728f13b7d3af6a4709b7521bd07dc1c445f394d | |
| parent | 1537fc6d027fe31571111bde1310e7f3153f91ea (diff) | |
| download | pfsense-682d280755ee7bd2140dca84b5ee21659a4ae580.zip pfsense-682d280755ee7bd2140dca84b5ee21659a4ae580.tar.gz | |
Make ppp-ipv6 the only way interface_dhcpv6_configure() is called on PPP interfaces
| -rw-r--r-- | etc/inc/interfaces.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index b425434..c1a1fd4 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); |
