diff options
| author | David Wood <david@wood2.org.uk> | 2016-01-06 01:42:54 +0000 |
|---|---|---|
| committer | David Wood <david@wood2.org.uk> | 2016-01-06 02:38:06 +0000 |
| commit | a31457d9614b7b3f57ea4864eca056a387a570c6 (patch) | |
| tree | a55fba260391168ba766cadca1372734497e9d26 /etc/inc/interfaces.inc | |
| parent | e68cb72f3eeebe6d2c83080ec412201b9f2323a7 (diff) | |
| download | pfsense-a31457d9614b7b3f57ea4864eca056a387a570c6.zip pfsense-a31457d9614b7b3f57ea4864eca056a387a570c6.tar.gz | |
Make ppp-ipv6 the only way interface_dhcpv6_configure() is called on PPP connections using PPP as the IPv6 parent interface
Diffstat (limited to 'etc/inc/interfaces.inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 69542f3..3982a67 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -3049,8 +3049,9 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven switch ($wancfg['ipaddrv6']) { case 'slaac': case 'dhcp6': - // The ppp-ipv6 script calls interface_dhcpv6_configure() for PPP connections after IPv6CP is up - if (!interface_isppp_type($interface)) { + // N.B. PPP connections using PPP as the IPv6 parent interface are excluded because the ppp-ipv6 script + // calls interface_dhcpv6_configure() for these connections after IPv6CP is up + if (!(interface_isppp_type($interface) && isset($wancfg['dhcp6usev4iface']))) { interface_dhcpv6_configure($interface, $wancfg); } break; |
