diff options
| author | Renato Botelho <renato@netgate.com> | 2017-07-31 16:36:44 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-07-31 16:36:44 -0300 |
| commit | 40f2618cf4d3fdf237631a2b5ff4ebaea9861f5b (patch) | |
| tree | 8465d5e2ed4011f70c97b20c61e329a4d595df76 /src/etc | |
| parent | 024a1db666cde7e17150eec60bcde4a0fdd3b454 (diff) | |
| parent | 3e86fa9913091ded202854a931fa02320f7fa1a0 (diff) | |
| download | pfsense-40f2618cf4d3fdf237631a2b5ff4ebaea9861f5b.zip pfsense-40f2618cf4d3fdf237631a2b5ff4ebaea9861f5b.tar.gz | |
Merge pull request #3761 from marjohn56/master
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/interfaces.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index fcc6ba1..472e087 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -5154,7 +5154,8 @@ function get_real_interface($interface = "wan", $family = "all", $realv6iface = case 'ppp': case 'l2tp': case 'pptp': - if (isset($cfg['dhcp6usev4iface']) && $realv6iface === false) { + // Added catch for static v6 but using v4 link. Sets things to use pppoe link + if ((isset($cfg['dhcp6usev4iface']) && $realv6iface === false) || isset($cfg['ipv6usev4iface'])) { $wanif = $cfg['if']; } else { $parents = get_parent_interface($interface); |
