Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge r4207

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-01-31 16:27:58 +00:00
parent 3c6c27f93e
commit df9ca2c72d
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/admin-core/root/lib/uci/schema/default/wireless
View file

@ -80,6 +80,13 @@ config variable
option datatype boolean option datatype boolean
list depends type=atheros list depends type=atheros
config variable
option name 'txpower'
option section 'wireless.wifi-device'
option title 'Transmit Power'
option description 'dbm'
option datatype uint
config variable config variable
option name 'txantenna' option name 'txantenna'
option section 'wireless.wifi-device' option section 'wireless.wifi-device'
@ -216,7 +223,7 @@ config enum
config variable config variable
option name 'bssid' option name 'bssid'
option section 'wireless.wifi-iface' option section 'wireless.wifi-iface'
option title BSSID option title 'BSSID'
config variable config variable
option name 'txpower' option name 'txpower'

7
modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
View file

@ -53,6 +53,9 @@ ch:value(151, 151 .. " (5 GHz)")
ch:value(155, 155 .. " (5 GHz)") ch:value(155, 155 .. " (5 GHz)")
ch:value(167, 167 .. " (5 GHz)") ch:value(167, 167 .. " (5 GHz)")
s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
------------------- MAC80211 Device ------------------ ------------------- MAC80211 Device ------------------
if hwtype == "mac80211" then if hwtype == "mac80211" then
@ -166,7 +169,6 @@ if hwtype == "mac80211" then
mode:value("monitor", translate("a_w_monitor")) mode:value("monitor", translate("a_w_monitor"))
bssid:depends({mode="adhoc"}) bssid:depends({mode="adhoc"})
s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
s:option(Value, "frag", translate("wifi_frag")).optional = true s:option(Value, "frag", translate("wifi_frag")).optional = true
s:option(Value, "rts", translate("wifi_rts")).optional = true s:option(Value, "rts", translate("wifi_rts")).optional = true
end end
@ -191,7 +193,6 @@ if hwtype == "atheros" then
wdssep.optional = true wdssep.optional = true
s:option(Flag, "doth", "802.11h").optional = true s:option(Flag, "doth", "802.11h").optional = true
s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
hidden = s:option(Flag, "hidden", translate("wifi_hidden")) hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
hidden:depends({mode="ap"}) hidden:depends({mode="ap"})
hidden:depends({mode="adhoc"}) hidden:depends({mode="adhoc"})
@ -249,8 +250,6 @@ if hwtype == "broadcom" then
mode:value("wds", translate("a_w_wds")) mode:value("wds", translate("a_w_wds"))
mode:value("monitor", translate("a_w_monitor")) mode:value("monitor", translate("a_w_monitor"))
s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
hidden = s:option(Flag, "hidden", translate("wifi_hidden")) hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
hidden:depends({mode="ap"}) hidden:depends({mode="ap"})
hidden:depends({mode="adhoc"}) hidden:depends({mode="adhoc"})