diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index bfcc5abe5..481edd8e6 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -2572,26 +2572,6 @@ function interface_track6_configure($interface = 'lan', $lancfg, $linkupevent = return; } - $lladdr = !empty($lancfg['track6-lladdr']) ? $lancfg['track6-lladdr'] : 'fe80::1:1'; - - $realif = get_real_interface($interface, 'inet6'); - - /* - * Always configure a fixed link-local on the track6 interfaces. - * - * The history of this change is under dispute. It was originally - * added to be able to access the web GUI under easily remembered - * IPv6 address, but it has issues with CARP and other "two boxes - * in one network". Now we added the override for fe80::1:1, and - * in the end it should work either way and all of this could be - * removed. Still considering complete removal for 19.1. - */ - $linklocal = find_interface_ipv6_ll($realif); - if (!empty($linklocal)) { - mwexecf('/sbin/ifconfig %s inet6 %s delete', array($realif, $linklocal)); - } - mwexecf('/sbin/ifconfig %s inet6 %s', array($realif, "{$lladdr}%{$realif}")); - switch ($trackcfg['ipaddrv6']) { case '6to4': interface_track6_6to4_configure($interface, $lancfg); diff --git a/src/www/interfaces.php b/src/www/interfaces.php index b707967b9..4bc260f0a 100644 --- a/src/www/interfaces.php +++ b/src/www/interfaces.php @@ -426,7 +426,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { 'subnet', 'subnetv6', 'track6-interface', - 'track6-lladdr', 'track6-prefix-id', 'rfc3118_isp', 'rfc3118_username', @@ -795,9 +794,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { } /* XXX should also check for duplicate delegation in peer trackers */ } - if (!empty($pconfig['track6-lladdr']) && (!is_ipaddrv6($pconfig['track6-lladdr']) || !is_linklocal($pconfig['track6-lladdr']))) { - $input_errors[] = gettext('A valid link-local tracking router address must be specified.'); - } break; } @@ -1226,7 +1222,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { case 'track6': $new_config['ipaddrv6'] = 'track6'; $new_config['track6-interface'] = $pconfig['track6-interface']; - $new_config['track6-lladdr'] = $pconfig['track6-lladdr']; $new_config['track6-prefix-id'] = 0; if (ctype_xdigit($pconfig['track6-prefix-id--hex'])) { $new_config['track6-prefix-id'] = intval($pconfig['track6-prefix-id--hex'], 16); @@ -3027,15 +3022,6 @@ include("head.inc"); -