luci-0.8: merge r4515-r4518

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index 1ecd5d25a994e08c7aefb0e1090cdae66f2b2828..ad80ae5ba3fa4af47989b2df18f398651691aec2 100644 (file)
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -681,6 +681,36 @@ function wifi.iwscan(iface)
        return iface and (iws[iface] or {}) or iws
 end
 
+--- Get available channels from given wireless iface.
+-- @param iface        Wireless interface (optional)
+-- @return             Table of available channels
+function wifi.channels(iface)
+       local cmd = "iwlist " .. ( iface or "" ) .. " freq 2>/dev/null"
+       local cns = { }
+
+       local fd = io.popen(cmd)
+       if fd then
+               local ln, c, f
+               repeat
+                       ln = fd:read("*l") or ""
+                       c, f = ln:match("Channel (%d+) : (%d+%.%d+) GHz")
+                       if c and f then
+                               cns[tonumber(c)] = tonumber(f)
+                       end
+               until not ( #ln > 0 )
+               fd:close()
+       end
+
+       if not ((pairs(cns))(cns)) then
+               cns = {
+                       2.412, 2.417, 2.422, 2.427, 2.432, 2.437,
+                       2.442, 2.447, 2.452, 2.457, 2.462
+               }
+       end
+
+       return cns
+end
+
 
 --- LuCI system utilities / init related functions.
 -- @class      module

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 e9261a3796fa6f7eeda4c2958e538c2df9b7877b..01180781954406865ef8417286087acf2cf3aee2 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -39,19 +39,9 @@ local hwtype = m:get(arg[1], "type")
 local nsantenna = m:get(arg[1], "antenna")
 
 ch = s:option(Value, "channel", translate("a_w_channel"))
-for i=1, 14 do
-       ch:value(i, i .. " (2.4 GHz)")
+for c, f in luci.util.kspairs(luci.sys.wifi.channels()) do
+       ch:value(c, "%i (%.3f GHz)" %{ c, f })
 end
-for i=36, 64, 4 do
-       ch:value(i, i .. " (5 GHz)")
-end
-for i=100, 140, 4 do
-       ch:value(i, i .. " (5 GHz)")
-end
-ch:value(147, 147 .. " (5 GHz)")
-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