From 5b464e500b80ae26d1a741bb3880c62877c95975 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 19 May 2011 23:51:50 +0000 Subject: [PATCH] modules/admin-full: fix wrong logic in r7078 --- modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 e58ac9e99..911245740 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua @@ -21,7 +21,7 @@ m.uci:foreach("network", "switch", local has_vlan4k = nil local has_ptpvid = nil local has_jumbo3 = nil - local min_vid = 1 + local min_vid = 0 local max_vid = 16 local num_vlans = 16 local num_ports = 5 @@ -54,6 +54,7 @@ m.uci:foreach("network", "switch", num_ports = tonumber(num_ports) or 5 num_vlans = tonumber(num_vlans) or 16 cpu_port = tonumber(cpu_port) or 5 + min_vid = 1 elseif line:match(": pvid") or line:match(": tag") or line:match(": vid") then if is_vlan_attr then has_vlan4k = line:match(": (%w+)") end @@ -68,10 +69,6 @@ m.uci:foreach("network", "switch", end swc:close() - - -- We have no swconfig, assume /proc/switch - else - min_vid = 0 end -- 2.11.0