modules/admin-full: move txpower control to wifi-device

modules/admin-core: extend wireless schema to cover txpower changes

diff --git a/modules/admin-core/root/lib/uci/schema/default/wireless b/modules/admin-core/root/lib/uci/schema/default/wireless
index c86733a..85532a1 100644 (file)
--- 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
        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'
        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'
 config variable
        option name 'bssid'
        option section 'wireless.wifi-iface'

-       option title BSSID
+       option title 'BSSID'

 
 config variable
        option name 'txpower'
 
 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 f436689..2eccad4 100644 (file)
--- 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)")
 
 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
 ------------------- 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"})
 
        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
        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
        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"})
        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"))
 
        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"})
        hidden = s:option(Flag, "hidden", translate("wifi_hidden"))
        hidden:depends({mode="ap"})
        hidden:depends({mode="adhoc"})