summaryrefslogtreecommitdiffhomepage
path: root/modules/admin-full/luasrc/view
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-12-02 12:21:18 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-12-02 12:21:18 +0000
commit02ad68a4062b336c962513d3e75aeca7a5348dbb (patch)
tree8051d6014e96dcd88da3cb8fa640c68fdac4e947 /modules/admin-full/luasrc/view
parent4e1bf37c4345bffa149f144a0c435df9b7fc4e1a (diff)
modules/admin-full: add supported bands to wifi overview adapter titles
Diffstat (limited to 'modules/admin-full/luasrc/view')
-rw-r--r--modules/admin-full/luasrc/view/admin_network/wifi_overview.htm26
1 files changed, 19 insertions, 7 deletions
diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
index 6a1020670b..615e766074 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -20,15 +20,29 @@ $Id$
local uci = require "luci.model.uci".cursor()
local ntm = require "luci.model.network"
+ local has_iwinfo = pcall(require, "iwinfo")
+
ntm.init(uci)
function guess_wifi_hw(ifname)
+ local bands = ""
local name, idx = ifname:match("^([a-z]+)(%d+)")
idx = tonumber(idx)
+ if has_iwinfo then
+ local iw = luci.sys.wifi.getiwinfo(ifname)
+ local bl = iw.hwmodelist
+ if bl and next(bl) then
+ if bl.a then bands = bands .. "a" end
+ if bl.b then bands = bands .. "b" end
+ if bl.g then bands = bands .. "g" end
+ if bl.n then bands = bands .. "n" end
+ end
+ end
+
-- wl.o
if name == "wl" then
- local name = "Broadcom 802.11 Wireless Controller"
+ local name = "Broadcom 802.11%s Wireless Controller" % bands
local nm = 0
local fd = nixio.open("/proc/bus/pci/devices", "r")
@@ -56,19 +70,19 @@ $Id$
-- madwifi
elseif name == "ath" or name == "wifi" then
- return "Atheros 802.11 Wireless Controller"
+ return "Atheros 802.11%s Wireless Controller" % bands
-- ralink
elseif name == "ra" then
- return "RaLink 802.11 Wireless Controller"
+ return "RaLink 802.11%s Wireless Controller" % bands
-- prism?
elseif name == "eth" then
- return "Prism 802.11 Wireless Controller"
+ return "Prism 802.11%s Wireless Controller" % bands
-- dunno yet
else
- return "Generic 802.11 Wireless Controller"
+ return "Generic 802.11%s Wireless Controller" % bands
end
end
@@ -87,8 +101,6 @@ $Id$
netdevs[net:ifname()] = dev:name()
end
end
-
- local has_iwinfo = pcall(require, "iwinfo")
-%>
<%+header%>