summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2008-09-22 19:01:17 +0000
committerJo-Philipp Wich <jow@openwrt.org>2008-09-22 19:01:17 +0000
commit93dc16c97611a97cbc90098c4e308dffbeac89ad (patch)
tree78f25b5dae24c9e30c7f959f9d9c7e3e1044ee04
parent8dce2f16eec2da576a57e06267f6dd806f3a8390 (diff)
* luci-0.8: backport olsr and wireless scheme fixes
-rw-r--r--applications/luci-olsr/luasrc/model/cbi/olsr/olsrdhna.lua4
-rw-r--r--libs/uvl/root/lib/uci/schema/default/wireless6
2 files changed, 8 insertions, 2 deletions
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
@@ -170,6 +170,12 @@ config section
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'
option title 'ESSID'