diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-05-07 10:44:41 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-05-07 11:40:48 -0300 |
| commit | 6d49e2ba8b0da497c06c667c3b7f683b5a9d6337 (patch) | |
| tree | ef1d1aab8ed003ceb0448b7b1a578f03cf1bae76 | |
| parent | 982e004f0ae0ae89f627e879be0f355001ae2f5d (diff) | |
| download | pfsense-6d49e2ba8b0da497c06c667c3b7f683b5a9d6337.zip pfsense-6d49e2ba8b0da497c06c667c3b7f683b5a9d6337.tar.gz | |
Revert "Fixes for track6 interfaces:"
It's not the correct fix
This reverts commit e8307ae03e2769bd0ebaa4b9441ac797b50a3800.
| -rw-r--r-- | etc/inc/interfaces.inc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 09f21a9..a618323 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -3091,7 +3091,7 @@ function interface_track6_configure($interface = "lan", $wancfg) { /* always configure a link-local of fe80::1:1 on the track6 interfaces */ $realif = get_real_interface($interface); $linklocal = find_interface_ipv6_ll($realif); - if (!empty($linklocal) && ($linklocal != "fe80::1:1")) + if (!empty($linklocal)) mwexec("/sbin/ifconfig {$realif} inet6 {$linklocal} delete"); mwexec("/sbin/ifconfig {$realif} inet6 fe80::1:1%{$realif}"); @@ -3267,11 +3267,10 @@ function interface_track6_dhcp6_configure($interface = "lan", $lancfg) { $lanif = get_real_interface($interface); $oip = find_interface_ipv6($lanif); - if (is_ipaddrv6($oip) && ($wancfg['ipaddrv6'] != "dhcp6")) { + if (is_ipaddrv6($oip)) mwexec("/sbin/ifconfig {$lanif} inet6 {$oip} delete"); - unset($interface_ipv6_arr_cache[$lanif]); - unset($interface_snv6_arr_cache[$lanif]); - } + unset($interface_ipv6_arr_cache[$lanif]); + unset($interface_snv6_arr_cache[$lanif]); if ($wancfg['ipaddrv6'] == "slaac") { $ifcfgipv6 = get_interface_ipv6($lancfg['track6-interface']); |
