Fixes #3281 do not undo any changes already done for gif/gre interface.

1 files changed, 13 insertions, 9 deletions

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 0620779..cd709a9 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -3020,15 +3020,19 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
 	if (!platform_booting()) {
 		link_interface_to_vips($interface, "update");
 
-		unset($gre);
-		$gre = link_interface_to_gre($interface);
-		if (!empty($gre))
-			array_walk($gre, 'interface_gre_configure');
-
-		unset($gif);
-		$gif = link_interface_to_gif($interface);
-		if (!empty($gif))
-			array_walk($gif, 'interface_gif_configure');
+		if ($tunnelif != 'gre') {
+			unset($gre);
+			$gre = link_interface_to_gre($interface);
+			if (!empty($gre))
+				array_walk($gre, 'interface_gre_configure');
+		}
+
+		if ($tunnelif != 'gif') {
+			unset($gif);
+			$gif = link_interface_to_gif($interface);
+			if (!empty($gif))
+				array_walk($gif, 'interface_gif_configure');
+		}
 
 		if ($linkupevent == false || substr($realif, 0, 4) == "ovpn") {
 			unset($bridgetmp);