luci-0.9: merge r5597

diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua
index c3efdd8557141996453c79228a1aedada0adb7a6..eaddfa2d9dd3563a027cac6e3dd2325f77995d98 100644 (file)
--- a/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua
+++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua
@@ -21,7 +21,6 @@ s.anonymous = true
 
 iface = s:option(ListValue, "src", translate("fw_src"))
 oface = s:option(ListValue, "dest", translate("fw_dest"))
-s:option(Flag, "mtu_fix", translate("fw_mtufix"))
 
 luci.model.uci.cursor():foreach("firewall", "zone",
        function (section)
@@ -79,4 +78,4 @@ end
 s:option(DummyValue, "target")
 
 
-return m
\ No newline at end of file
+return m

diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua
index 46bd636b26da4f2bc080a57f66af10cf109564b3..45ee4048891b1bb9164e2141071670c0e96a5563 100644 (file)
--- a/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua
+++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua
@@ -58,6 +58,7 @@ for i, v in ipairs(p) do
 end
 
 s:option(Flag, "masq")
+s:option(Flag, "mtu_fix", translate("fw_mtufix"))
 
 net = s:option(MultiValue, "network")
 net.widget = "select"