branches/luci-0.8: backport wifi and olsr fixes

rags/0.8.3: backport wifi and olsr fixes

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
index 6a498a5b2b91f8a6bf351ad6c476c1409f7822c4..a0d6a235707a3a3270a71c2d91afe3923b8a98cb 100644 (file)
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
@@ -26,6 +26,7 @@ if arg[1] then
        ign = p:option(Flag, "ignore", "Enable")
        ign.enabled  = "0"
        ign.disabled = "1"
+       ign.rmempty  = false
        function ign.cfgvalue(self, section)
                return Flag.cfgvalue(self, section) or "0"
        end
@@ -230,8 +231,9 @@ else
        end
 
        ign = t:option( Flag, "ignore", "Enabled" )
-       ign.enabled = "0"
+       ign.enabled  = "0"
        ign.disabled = "1"
+       ign.rmempty  = false
        function ign.cfgvalue(self, section)
                return Flag.cfgvalue(self, section) or "0"
        end

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index b64190bc0a64a8182c9d53b6740bb3a7295aa423..0ed725b613c2b74e5f15e3d0ba651851ed49a871 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -72,7 +72,7 @@ if hwtype == "atheros" then
        mode:value("11adt", "802.11adt")
        mode:value("fh", translate("wifi_fh"))
 
-       s:option(Flag, "diversity", translate("wifi_diversity"))
+       s:option(Flag, "diversity", translate("wifi_diversity")).rmempty = false
 
        if not nsantenna then
                s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true