diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 48e52719d..d91df7717 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -2938,9 +2938,8 @@ function interface_dhcpv6_configure($interface = 'wan', $wancfg) ) ); - if (isset($wancfg['dhcp6sendsolicit'])) { - mwexec("/var/etc/rtsold_{$realifv6}_script.sh"); - } + /* unconditional trigger for hybrid approach, reloads without advertisements */ + mwexec("/var/etc/rtsold_{$realifv6}_script.sh"); } function interface_dhcpv6_prepare($interface = 'wan', $wancfg) diff --git a/src/www/interfaces.php b/src/www/interfaces.php index 323c2ceea..81854b4d3 100644 --- a/src/www/interfaces.php +++ b/src/www/interfaces.php @@ -437,7 +437,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $pconfig['blockbogons'] = isset($a_interfaces[$if]['blockbogons']); $pconfig['dhcpoverridemtu'] = empty($a_interfaces[$if]['dhcphonourmtu']) ? true : null; $pconfig['dhcp6-ia-pd-send-hint'] = isset($a_interfaces[$if]['dhcp6-ia-pd-send-hint']); - $pconfig['dhcp6sendsolicit'] = isset($a_interfaces[$if]['dhcp6sendsolicit']); $pconfig['dhcp6prefixonly'] = isset($a_interfaces[$if]['dhcp6prefixonly']); $pconfig['dhcp6usev4iface'] = isset($a_interfaces[$if]['dhcp6usev4iface']); $pconfig['dhcp6norelease'] = isset($a_interfaces[$if]['dhcp6norelease']); @@ -1176,9 +1175,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { if (!empty($pconfig['dhcp6prefixonly'])) { $new_config['dhcp6prefixonly'] = true; } - if (!empty($pconfig['dhcp6sendsolicit'])) { - $new_config['dhcp6sendsolicit'] = true; - } if (!empty($pconfig['dhcp6usev4iface'])) { $new_config['dhcp6usev4iface'] = true; } @@ -2734,15 +2730,6 @@ include("head.inc"); - - - - /> - - -