* 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 a5b6b1289ace6b699345c544b83f68f61f2a4113..632a4d4a4ba79e484fa41619651dd89d3df89ad4 100644 (file)
--- 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 3b4fb6fe8ba84b9c00965f1e7558809fb7ffec22..823ee2fa4faf200bdd097a95c2bf991e0031fb1e 100644 (file)
--- 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'