From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 1 Jan 2009 14:33:36 +0000 (+0000)
Subject: branches/luci-0.8: backport wifi and olsr fixes
X-Git-Tag: 0.8.4~31
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=7429b91e4b6f4223c24413d1889cda713a17e0ee;p=project%2Fluci.git

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 6a498a5b2b..a0d6a23570 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 b64190bc0a..0ed725b613 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