luci-0.10: merge r7086

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 b4ad864c61547c285092c4565fe15eef7957a3ab..c2f1c1fe542ce3da16b6cde1e177d36336729618 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua
@@ -24,6 +24,7 @@ m.uci:foreach("network", "switch",
                local has_learn   = nil 
                local has_vlan4k  = nil
                local has_ptpvid  = nil
+               local has_jumbo3  = nil
                local min_vid     = 0
                local max_vid     = 16
                local num_vlans   = 16
@@ -76,6 +77,8 @@ m.uci:foreach("network", "switch",
                                elseif line:match(": enable_vlan4k") then
                                        enable_vlan4k = true
 
+                               elseif line:match(": max_length") then
+                                       has_jumbo3 = "max_length"
                                end
                        end
 
@@ -133,6 +136,12 @@ m.uci:foreach("network", "switch",
                        x.default = x.enabled
                end
 
+               if has_jumbo3 then
+                       x = s:option(Flag, has_jumbo3, translate("Enable Jumbo Frame passthrough"))
+                       x.enabled = "3"
+                       x.rmempty = true
+               end
+
                if has_reset then
                        x = s:option(Flag, has_reset, translate("Reset switch during setup"))
                        x.default = x.enabled