From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 22 Sep 2008 19:01:17 +0000 (+0000)
Subject: * luci-0.8: backport olsr and wireless scheme fixes
X-Git-Tag: 0.8.0~46
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=93dc16c97611a97cbc90098c4e308dffbeac89ad;p=project%2Fluci.git

* luci-0.8: backport olsr and wireless scheme fixes
---

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
index a5b6b1289a..632a4d4a4b 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
@@ -20,8 +20,8 @@ for i, sect in ipairs({ "Hna4", "Hna6" }) do
 	hna.anonymous = true
 	hna.template  = "cbi/tblsection"
 
-	net = hna:option(Value, "NetAddr")
-	msk = hna:option(Value, "Prefix")
+	net = hna:option(Value, "netaddr")
+	msk = hna:option(Value, "netmask")
 end
 
 return mh
diff --git a/libs/uvl/root/lib/uci/schema/default/wireless b/libs/uvl/root/lib/uci/schema/default/wireless
index 3b4fb6fe8b..823ee2fa4f 100644
--- a/libs/uvl/root/lib/uci/schema/default/wireless
+++ b/libs/uvl/root/lib/uci/schema/default/wireless
@@ -169,6 +169,12 @@ config section
 	option package 'wireless'
 	option title 'Interfaces'
 
+config variable
+	option name 'device'
+	option section 'wireless.wifi-iface'
+	option title 'Wifi Device'
+	option valueof 'wireless.wifi-device'
+
 config variable
 	option name 'ssid'
 	option section 'wireless.wifi-iface'