From 2fbccb05faedf70e44db85ba83c4dfaf750dc24f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 22 Apr 2019 12:50:23 +0200
Subject: [PATCH] interfaces: last refactor #3406

---
 src/etc/inc/interfaces.inc | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 16ed58123..e30254995 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -2561,18 +2561,20 @@ function interface_track6_configure($interface = 'lan', $lancfg, $linkupevent =
         return;
     }
 
-    switch ($trackcfg['ipaddrv6']) {
-        case 'slaac':
-        case 'dhcp6':
-            if ($linkdownevent) {
+    if ($linkdownevent) {
+        switch ($trackcfg['ipaddrv6']) {
+            case 'slaac':
+            case 'dhcp6':
                 interface_dhcpv6_prepare($lancfg['track6-interface'], $trackcfg);
                 $parentrealif = get_real_interface($lancfg['track6-interface'], 'inet6');
                 killbypid("/var/run/dhcp6c_{$parentrealif}.pid", 'HUP');
-                return;
-            }
-            break;
-        default:
-            break;
+                break;
+            default:
+                break;
+        }
+
+        /* exit now as there are only linkup-related bits following */
+        return;
     }
 
     switch ($trackcfg['ipaddrv6']) {