interfaces: simplify destroy as we do not log it any longer

opnsense · Feb 24, 2022 · 84cd38a · 84cd38a
1 parent d9ddc7b
commit 84cd38a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
@@ -1700,10 +1700,7 @@ function interface_wireless_clone($realif, $wlcfg)
     }
 
     if ($needs_clone) {
-        /* remove previous instance if it exists */
-        if (does_interface_exist($realif)) {
-            legacy_interface_destroy($realif);
-        }
+        legacy_interface_destroy($realif);
 
         log_error("Cloning new wireless interface {$realif}");
         exec("/sbin/ifconfig wlan create wlandev {$baseif} {$mode} bssid name {$realif} 2>&1", $out, $ret);
@@ -2741,9 +2738,7 @@ function interface_6rd_configure($interface = 'wan', $wancfg)
     $rd6brgw = "{$rd6prefix_isp}{$wancfg['gateway-6rd']}";
 
     $stfiface = "{$interface}_stf";
-    if (does_interface_exist($stfiface)) {
-        legacy_interface_destroy($stfiface);
-    }
+    legacy_interface_destroy($stfiface);
     legacy_interface_create('stf', $stfiface);
     legacy_interface_flags($stfiface, 'link2');
 
@@ -2839,9 +2834,7 @@ function interface_6to4_configure($interface = 'wan', $wancfg)
     $stflan = Net_IPv6::compress(implode(":", $stflanarr));
 
     $stfiface = "{$interface}_stf";
-    if (does_interface_exist($stfiface)) {
-        legacy_interface_destroy($stfiface);
-    }
+    legacy_interface_destroy($stfiface);
     legacy_interface_create('stf', $stfiface);
     legacy_interface_flags($stfiface, 'link2');
 

diff --git a/src/www/interfaces_vlan.php b/src/www/interfaces_vlan.php
@@ -42,9 +42,7 @@
         if (is_interface_assigned($a_vlans[$id]['vlanif'])) {
             $input_errors[] = gettext("This VLAN cannot be deleted because it is assigned as an interface.");
         } else {
-            if (does_interface_exist($a_vlans[$id]['vlanif'])) {
-                legacy_interface_destroy($a_vlans[$id]['vlanif']);
-            }
+            legacy_interface_destroy($a_vlans[$id]['vlanif']);
             unset($a_vlans[$id]);
             write_config();
             header(url_safe('Location: /interfaces_vlan.php'));