summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-01-01 13:55:40 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-01-01 13:55:40 +0000
commitae6c1f618f3618e386863b655a3be02de14d8f3b (patch)
tree7f385bb6aaaac5b100910ac0626c802a4ddfcb9b
parentf008ec70f982113b71ee00fbda2ee24868e1c360 (diff)
modules/admin-full: fix diversity setting for atheros cards
applications/olsr: fix enable/disable for olsrd plugins
-rw-r--r--applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua4
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua2
2 files changed, 4 insertions, 2 deletions
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
index 6a498a5b2..a0d6a2357 100644
--- 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 b64190bc0..0ed725b61 100644
--- 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