Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: network.js: fix getDevices()

Browse source 
- Don't filter virtual interfaces
 - Skip duplicate wireless devices

Fixes: #3304
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 304dd37e3f)
This commit is contained in:
Jo-Philipp Wich 2019-11-13 18:30:22 +01:00
parent 9d6b01974e
commit ebd354d420
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/luci-base/htdocs/luci-static/resources/network.js
View file

@ -385,6 +385,7 @@ function initNetworkState(refresh) {
type: dev.type, type: dev.type,
mtu: dev.mtu, mtu: dev.mtu,
qlen: dev.qlen, qlen: dev.qlen,
wireless: dev.wireless,
ipaddrs: [], ipaddrs: [],
ip6addrs: [] ip6addrs: []
}; };
@ -1148,7 +1149,10 @@ Network = L.Class.extend(/** @lends LuCI.Network.prototype */ {
if (devices.hasOwnProperty(ifname)) if (devices.hasOwnProperty(ifname))
continue; continue;
if (isIgnoredIfname(ifname) || isVirtualIfname(ifname) || isWifiIfname(ifname)) if (isIgnoredIfname(ifname) || isWifiIfname(ifname))
continue;
if (_state.netdevs[ifname].wireless)
continue; continue;
devices[ifname] = this.instantiateDevice(ifname); devices[ifname] = this.instantiateDevice(ifname);