* luci-0.8: merge r3785 and r3786

This commit is contained in:
Jo-Philipp Wich 2008-11-16 18:46:28 +00:00
parent 1ecec8981c
commit f373b657c5
2 changed files with 17 additions and 20 deletions

View file

@ -83,16 +83,26 @@ config variable
config variable
option name 'txantenna'
option section 'wireless.wifi-device'
option title 'Transmitter Antenna (atheros)'
option title 'Transmitter Antenna'
option datatype uint
list depends type=atheros
list depends type=broadcom
config variable
option name 'rxantenna'
option section 'wireless.wifi-device'
option title 'Receiver Antenna (atheros)'
option title 'Receiver Antenna'
option datatype uint
list depends type=atheros
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
option name 'distance'
@ -129,20 +139,6 @@ config variable
option type lazylist
option datatype macaddr
config variable
option name 'txant'
option section 'wireless.wifi-device'
option title 'Transmitter Antenna (broadcom)'
option datatype uint
list depends 'type=broadcom'
config variable
option name 'rxant'
option section 'wireless.wifi-device'
option title 'Receiver Antenna (broadcom)'
option datatype uint
list depends 'type=broadcom'
config variable
option name 'frameburst'
option section 'wireless.wifi-device'

View file

@ -104,8 +104,9 @@ if hwtype == "broadcom" then
ml:depends({macfilter="allow"})
ml:depends({macfilter="deny"})
s:option(Value, "txant", translate("wifi_txantenna")).optional = true
s:option(Value, "rxant", translate("wifi_rxantenna")).optional = true
s:option(Value, "txantenna", translate("wifi_txantenna")).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
@ -164,7 +165,7 @@ if hwtype == "mac80211" then
mode:value("monitor", translate("a_w_monitor"))
bssid:depends({mode="adhoc"})
s:option(Value, "txpower", translate("a_w_txpwr"), "dbm").rmempty = true
s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
s:option(Value, "frag", translate("wifi_frag")).optional = true
s:option(Value, "rts", translate("wifi_rts")).optional = true
end
@ -189,7 +190,7 @@ if hwtype == "atheros" then
wdssep.optional = true
s:option(Flag, "doth", "802.11h").optional = true
s:option(Value, "txpower", translate("a_w_txpwr"), "dbm").rmempty = true
s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true
hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
hidden:depends({mode="ap"})
hidden:depends({mode="adhoc"})