Changeset 6787

Timestamp:

01/24/11 09:37:06 (2 years ago)

Author:

jow

Message:

modules/admin-full: fix txpower related config issues with atheros and broadcom drivers

Files:

• luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua (modified) (4 diffs)

luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua

@@ -52 +52 @@
 
 local iw = luci.sys.wifi.getiwinfo(arg[1])
+local hw_modes  = iw.hwmodelist or { }
 local tx_powers = iw.txpwrlist  or { }
-local hw_modes  = iw.hwmodelist or { }
-
+local tx_power  = tostring(
+    (iw.txpower and iw.txpower > 0 and iw.txpower) or
+    (#tx_powers > 0 and tx_powers[#tx_powers].dbm)
+)
 
 s = m:section(NamedSection, wdev:name(), "wifi-device", translate("Device Configuration"))
@@ -106 +109 @@
 
     tp.rmempty = true
-    tp.default = tostring(iw and iw.txpower or tx_powers[#tx_powers])
+    tp.default = tx_power
     for _, p in ipairs(tx_powers or {}) do
         tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
@@ -157 +160 @@
 
     tp.rmempty = true
-    for _, p in ipairs(iw.txpwrlist) do
+    tp.default = tx_power
+    for _, p in ipairs(tx_powers or {}) do
         tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
     end
@@ -217 +221 @@
 
     tp.rmempty = true
-    for _, p in ipairs(iw.txpwrlist) do
+    tp.default = tx_power
+    for _, p in ipairs(tx_powers or {}) do
         tp:value(p.dbm, "%i dBm (%i mW)" %{ p.dbm, p.mw })
     end