Fix up final bits of PPPoE Periodic reset and disable setting of bandwidths for mlppp links for now.

1 files changed, 2 insertions, 10 deletions

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 4fde54d..29a3464 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -817,13 +817,10 @@ function interface_bring_down($interface = "wan", $destroy = false) {
 	$realif = get_real_interface($interface);
 
 	switch ($ifcfg['ipaddr']) {
+	case "ppp":
 	case "pppoe":
-		killbypid("{$g['varrun_path']}/pppoe_{$interface}.pid");
-		sleep(2);
-		unlink_if_exists("{$g['varetc_path']}/mpd_{$interface}.conf");
-		break;
 	case "pptp":
-		killbypid("{$g['varrun_path']}/pptp_{$interface}.pid");
+		killbypid("{$g['varrun_path']}/{$ifcfg['ipaddr']}_{$interface}.pid");
 		sleep(2);
 		unlink_if_exists("{$g['varetc_path']}/mpd_{$interface}.conf");
 		break;
@@ -844,11 +841,6 @@ function interface_bring_down($interface = "wan", $destroy = false) {
 			mwexec("/usr/sbin/arp -d -i {$realif} -a");
 		}
 		break;
-	case "ppp":
-		killbypid("{$g['varrun_path']}/ppp_{$interface}.pid");
-		sleep(2);
-		unlink_if_exists("{$g['varetc_path']}/mpd_{$interface}.conf");
-		break;
 	default:
 		if(does_interface_exist("$realif")) {
 			mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " delete", true);