From 4bfa18a5ab7fed48ae0d55b26bd9d773c4b2e40b Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 16 Nov 2008 20:07:55 +0000 Subject: [PATCH] * luci/modules/admin-{core,full}: sync wireless model and scheme to new broadcom config --- modules/admin-core/root/lib/uci/schema/default/wireless | 10 +--------- modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua | 3 ++- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/modules/admin-core/root/lib/uci/schema/default/wireless b/modules/admin-core/root/lib/uci/schema/default/wireless index c449850f1..5ec26bc00 100644 --- a/modules/admin-core/root/lib/uci/schema/default/wireless +++ b/modules/admin-core/root/lib/uci/schema/default/wireless @@ -97,14 +97,6 @@ config variable 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' option section 'wireless.wifi-device' option title 'Distance Optimization (atheros, broadcom)' @@ -229,7 +221,7 @@ config variable config variable option name 'txpower' option section 'wireless.wifi-iface' - option title 'Transmit Power (mac80211, atheros)' + option title 'Transmit Power' option description 'dbm' option datatype uint 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 043c3284e..f0143a3e5 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -106,7 +106,6 @@ if hwtype == "broadcom" then 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 @@ -243,6 +242,8 @@ 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"}) -- 2.11.0