* luci-0.8: merge r3788

This commit is contained in:
Jo-Philipp Wich 2008-11-16 20:09:45 +00:00
parent f373b657c5
commit 67fd838640
2 changed files with 3 additions and 10 deletions

View file

@ -96,14 +96,6 @@ config variable
list depends type=atheros list depends type=atheros
list depends type=broadcom list depends type=broadcom
config variable
option name 'txpower'
option section 'wireless.wifi-device'
option title 'Transmit Power (broadcom)'
option description 'dbm'
option datatype uint
list depends type=broadcom
config variable config variable
option name 'distance' option name 'distance'
option section 'wireless.wifi-device' option section 'wireless.wifi-device'
@ -229,7 +221,7 @@ config variable
config variable config variable
option name 'txpower' option name 'txpower'
option section 'wireless.wifi-iface' option section 'wireless.wifi-iface'
option title 'Transmit Power (mac80211, atheros)' option title 'Transmit Power'
option description 'dbm' option description 'dbm'
option datatype uint option datatype uint

View file

@ -106,7 +106,6 @@ if hwtype == "broadcom" then
s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true s:option(Value, "txantenna", translate("wifi_txantenna")).optional = true
s:option(Value, "rxantenna", translate("wifi_rxantenna")).optional = true s:option(Value, "rxantenna", translate("wifi_rxantenna")).optional = true
s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").optional = true
s:option(Flag, "frameburst", translate("wifi_bursting")).optional = true s:option(Flag, "frameburst", translate("wifi_bursting")).optional = true
@ -243,6 +242,8 @@ 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"})