Merge remote branch 'upstream/master'

Conflicts:
	etc/inc/interfaces.inc
	etc/inc/system.inc

1 files changed, 13 insertions, 0 deletions

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 494f81b..f3cb60b 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -1311,6 +1311,19 @@ function start_devd() {
         sleep(1);
 }
 
+function is_interface_vlan_mismatch() {
+        global $config, $g;
+
+        if (is_array($config['vlans']['vlan'])) {
+                foreach ($config['vlans']['vlan'] as $vlan) {
+                        if (does_interface_exist($vlan['if']) == false)
+				return true;
+                }
+        }
+
+	return false;
+}
+
 function is_interface_mismatch() {
         global $config, $g;