* luci-0.8: merge r3788

diff --git a/modules/admin-core/root/lib/uci/schema/default/wireless b/modules/admin-core/root/lib/uci/schema/default/wireless
index c449850f1a241f7d5583dc1d6224e06620643d1d..5ec26bc00e1bf5407b316fbab34c3b5940157401 100644 (file)
--- a/modules/admin-core/root/lib/uci/schema/default/wireless
+++ b/modules/admin-core/root/lib/uci/schema/default/wireless
@@ -96,14 +96,6 @@ config variable
        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'
        option section 'wireless.wifi-device'
@@ -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 043c3284e298c2d4250d3bb3b42b1bddf16ed62b..f0143a3e50995ec77c8fe64f45e0b67ba576e05f 100644 (file)
--- 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"})