modules/admin-full: add supported bands to wifi overview adapter titles
This commit is contained in:
parent
4e1bf37c43
commit
02ad68a406
1 changed files with 19 additions and 7 deletions
|
@ -20,15 +20,29 @@ $Id$
|
||||||
local uci = require "luci.model.uci".cursor()
|
local uci = require "luci.model.uci".cursor()
|
||||||
local ntm = require "luci.model.network"
|
local ntm = require "luci.model.network"
|
||||||
|
|
||||||
|
local has_iwinfo = pcall(require, "iwinfo")
|
||||||
|
|
||||||
ntm.init(uci)
|
ntm.init(uci)
|
||||||
|
|
||||||
function guess_wifi_hw(ifname)
|
function guess_wifi_hw(ifname)
|
||||||
|
local bands = ""
|
||||||
local name, idx = ifname:match("^([a-z]+)(%d+)")
|
local name, idx = ifname:match("^([a-z]+)(%d+)")
|
||||||
idx = tonumber(idx)
|
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
|
-- wl.o
|
||||||
if name == "wl" then
|
if name == "wl" then
|
||||||
local name = "Broadcom 802.11 Wireless Controller"
|
local name = "Broadcom 802.11%s Wireless Controller" % bands
|
||||||
local nm = 0
|
local nm = 0
|
||||||
|
|
||||||
local fd = nixio.open("/proc/bus/pci/devices", "r")
|
local fd = nixio.open("/proc/bus/pci/devices", "r")
|
||||||
|
@ -56,19 +70,19 @@ $Id$
|
||||||
|
|
||||||
-- madwifi
|
-- madwifi
|
||||||
elseif name == "ath" or name == "wifi" then
|
elseif name == "ath" or name == "wifi" then
|
||||||
return "Atheros 802.11 Wireless Controller"
|
return "Atheros 802.11%s Wireless Controller" % bands
|
||||||
|
|
||||||
-- ralink
|
-- ralink
|
||||||
elseif name == "ra" then
|
elseif name == "ra" then
|
||||||
return "RaLink 802.11 Wireless Controller"
|
return "RaLink 802.11%s Wireless Controller" % bands
|
||||||
|
|
||||||
-- prism?
|
-- prism?
|
||||||
elseif name == "eth" then
|
elseif name == "eth" then
|
||||||
return "Prism 802.11 Wireless Controller"
|
return "Prism 802.11%s Wireless Controller" % bands
|
||||||
|
|
||||||
-- dunno yet
|
-- dunno yet
|
||||||
else
|
else
|
||||||
return "Generic 802.11 Wireless Controller"
|
return "Generic 802.11%s Wireless Controller" % bands
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -87,8 +101,6 @@ $Id$
|
||||||
netdevs[net:ifname()] = dev:name()
|
netdevs[net:ifname()] = dev:name()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local has_iwinfo = pcall(require, "iwinfo")
|
|
||||||
-%>
|
-%>
|
||||||
|
|
||||||
<%+header%>
|
<%+header%>
|
||||||
|
|
Loading…
Reference in a new issue