Merge pull request #3515 from marjohn56/master

2 files changed, 3 insertions, 9 deletions

diff --git a/src/usr/local/sbin/ppp-ipv6 b/src/usr/local/sbin/ppp-ipv6
index 53d9bcc..c98e1f1 100755
--- a/src/usr/local/sbin/ppp-ipv6
+++ b/src/usr/local/sbin/ppp-ipv6
@@ -41,11 +41,8 @@ function interface_ipv6_lower($interface_real) {
                             break;
                         }
                         // bring down dhcp6c if it is running
-                        $pidv6 = find_dhcp6c_process($interface_real);
-                        if ($pidv6) {
-                            posix_kill($pidv6, SIGTERM);
-                            sleep(3);
-                        }
+						kill_dhcp6client_process($interface_real,false);
+
                         unlink_if_exists("{$g['varetc_path']}/dhcp6c_{$interface}.conf");
 
                         // disable router advertisements (and therefore SLAAC)
diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php
index e00856d..fd9965b 100755
--- a/src/usr/local/www/interfaces.php
+++ b/src/usr/local/www/interfaces.php
@@ -987,10 +987,7 @@ if ($_POST['apply']) {
 				kill_dhclient_process($wancfg['if']);
 			}
 			if ($wancfg['ipaddrv6'] == "dhcp6") {
-				$pid = find_dhcp6c_process($wancfg['if']);
-				if ($pid) {
-					posix_kill($pid, SIGTERM);
-				}
+				kill_dhcp6client_process($wancfg['if'],true);
 			}
 		}
 		$ppp = array();