From ffbb29e4146cae94b5916c96e3752d14fb834c49 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 18 Sep 2016 12:13:25 +0200
Subject: [PATCH] (interfaces.inc) move single used find_interface_subnetv6()
 into get_interface_subnetv6()

---
 src/etc/inc/interfaces.inc | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 9e5832444..e2bfd3f32 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -4397,17 +4397,6 @@ function find_interface_subnet($interface)
     return null;
 }
 
-function find_interface_subnetv6($interface)
-{
-    $interface = trim($interface);
-    if (does_interface_exist($interface)) {
-        $ifinfo = legacy_get_interface_addresses($interface);
-        if (isset($ifinfo['subnetbits6'])) {
-            return $ifinfo['subnetbits6'];
-        }
-    }
-    return null;
-}
 
 function ip_in_interface_alias_subnet($interface, $ipalias)
 {
@@ -4552,9 +4541,11 @@ function get_interface_subnetv6($interface = "wan")
         }
     }
 
-    $cursn = find_interface_subnetv6($realif);
-    if (!empty($cursn)) {
-        return $cursn;
+    if (does_interface_exist($realif)) {
+        $ifinfo = legacy_get_interface_addresses($realif);
+        if (isset($ifinfo['subnetbits6'])) {
+            return $ifinfo['subnetbits6'];
+        }
     }
 
     return null;