From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 21 Nov 2009 00:24:28 +0000 (+0000)
Subject: luci-0.9: merge r5560
X-Git-Tag: 0.9.0~103
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7d2189ddfac036fa5e99524e00bbd62b02c41cc0;p=project%2Fluci.git

luci-0.9: merge r5560
---

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index 74e2ba0d51..6b7ff9edcb 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -90,6 +90,8 @@ for i=0,7 do
 end
 willingness.optional = true
 
+natthr = s:option(Value, "NatThreshold")
+natthr.optional = true
 
 
 i = m:section(TypedSection, "Interface", translate("interfaces"))
diff --git a/contrib/package/olsrd-luci/files/etc/config/olsrd b/contrib/package/olsrd-luci/files/etc/config/olsrd
index 50fa556e1d..5e490c3403 100644
--- a/contrib/package/olsrd-luci/files/etc/config/olsrd
+++ b/contrib/package/olsrd-luci/files/etc/config/olsrd
@@ -2,6 +2,7 @@ config 'olsrd'
 	option 'IpVersion' '4'
 	option 'FIBMetric' 'flat'
 	option 'LinkQualityAlgorithm' 'etx_ff'
+	option 'NatThreshold' '0.75'
 
 config 'Interface'
 	option 'ignore' '1'