Changeset 7081

Timestamp:

05/20/11 00:52:24 (2 years ago)

Author:

jow

Message:

luci-0.10: merge r7080

Files:

• luci/branches/luci-0.10/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua (modified) (3 diffs)

luci/branches/luci-0.10/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua

@@ -22 +22 @@
         local has_ptpvid  = nil
         local has_jumbo3  = nil
-        local min_vid     = 1
+        local min_vid     = 0
         local max_vid     = 16
         local num_vlans   = 16
@@ -55 +55 @@
                     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
@@ -69 +70 @@
 
             swc:close()
-
-        -- We have no swconfig, assume /proc/switch
-        else
-            min_vid = 0
         end