From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 19 May 2011 12:23:02 +0000 (+0000)
Subject: luci-0.10: merge r7078
X-Git-Tag: 0.10.0~137
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1ed7b97641c428d247ebc6846648c199fc37655a;p=oweals%2Fluci.git

luci-0.10: merge r7078
---

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
index 2a45e6002..e58ac9e99 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
@@ -21,6 +21,7 @@ m.uci:foreach("network", "switch",
 		local has_vlan4k  = nil
 		local has_ptpvid  = nil
 		local has_jumbo3  = nil
+		local min_vid     = 1
 		local max_vid     = 16
 		local num_vlans   = 16
 		local num_ports   = 5
@@ -67,6 +68,10 @@ m.uci:foreach("network", "switch",
 			end
 
 			swc:close()
+
+		-- We have no swconfig, assume /proc/switch
+		else
+			min_vid = 0
 		end
 
 
@@ -219,11 +224,11 @@ m.uci:foreach("network", "switch",
 		vid.validate = function(self, value, section)
 			local v = tonumber(value)
 			local m = has_vlan4k and 4094 or (num_vlans - 1)
-			if v ~= nil and v > 0 and v <= m then
+			if v ~= nil and v >= min_vid and v <= m then
 				return value
 			else
 				return nil,
-					translatef("Invalid VLAN ID given! Only IDs between %d and %d are allowed.", 1, m)
+					translatef("Invalid VLAN ID given! Only IDs between %d and %d are allowed.", min_vid, m)
 			end
 		end