diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-01-31 16:27:24 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-01-31 16:27:24 +0000 |
| commit | 56f5204e8f61c065023fc3a014355b4cacaa0772 (patch) | |
| tree | 59eef6ec2f69fc4fb9f95513b60c3e06230d73bc | |
| parent | 910ac84a460916f7dba4a536b7cf08402ccd7f02 (diff) | |
modules/admin-full: move txpower control to wifi-device
modules/admin-core: extend wireless schema to cover txpower changes
| -rw-r--r-- | modules/admin-core/root/lib/uci/schema/default/wireless | 9 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/modules/admin-core/root/lib/uci/schema/default/wireless b/modules/admin-core/root/lib/uci/schema/default/wireless index c86733afa..85532a1d2 100644 --- a/modules/admin-core/root/lib/uci/schema/default/wireless +++ b/modules/admin-core/root/lib/uci/schema/default/wireless @@ -81,6 +81,13 @@ config variable 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 option name 'txantenna' option section 'wireless.wifi-device' option title 'Transmitter Antenna' @@ -216,7 +223,7 @@ config enum config variable option name 'bssid' option section 'wireless.wifi-iface' - option title BSSID + option title 'BSSID' config variable option name 'txpower' diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua index f436689a6..2eccad420 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -53,6 +53,9 @@ ch:value(151, 151 .. " (5 GHz)") ch:value(155, 155 .. " (5 GHz)") ch:value(167, 167 .. " (5 GHz)") +s:option(Value, "txpower", translate("a_w_txpwr"), "dBm").rmempty = true + + ------------------- MAC80211 Device ------------------ if hwtype == "mac80211" then @@ -166,7 +169,6 @@ 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, "frag", translate("wifi_frag")).optional = true s:option(Value, "rts", translate("wifi_rts")).optional = true end @@ -191,7 +193,6 @@ 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 hidden = s:option(Flag, "hidden", translate("wifi_hidden")) hidden:depends({mode="ap"}) hidden:depends({mode="adhoc"}) @@ -249,8 +250,6 @@ if hwtype == "broadcom" then mode:value("wds", translate("a_w_wds")) 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:depends({mode="ap"}) hidden:depends({mode="adhoc"}) |