luci-base: network.js: fix getDevices()
- Don't filter virtual interfaces - Skip duplicate wireless devices Fixes: #3304 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
parent
2e8aa301aa
commit
304dd37e3f
1 changed files with 5 additions and 1 deletions
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue