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>
(cherry picked from commit 304dd37e3fb44843466c38b883fa91b463b5cd1c)

diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
index 3cc51ed40a873b1aa2da03b0f7efb965bade95b0..504f592978b83475fb1f2bd402c2617fae83f582 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -385,6 +385,7 @@ function initNetworkState(refresh) {
                                        type:     dev.type,
                                        mtu:      dev.mtu,
                                        qlen:     dev.qlen,
+                                       wireless: dev.wireless,
                                        ipaddrs:  [],
                                        ip6addrs: []
                                };
@@ -1148,7 +1149,10 @@ Network = L.Class.extend(/** @lends LuCI.Network.prototype */ {
                                if (devices.hasOwnProperty(ifname))
                                        continue;
 
-                               if (isIgnoredIfname(ifname) || isVirtualIfname(ifname) || isWifiIfname(ifname))
+                               if (isIgnoredIfname(ifname) || isWifiIfname(ifname))
+                                       continue;
+
+                               if (_state.netdevs[ifname].wireless)
                                        continue;
 
                                devices[ifname] = this.instantiateDevice(ifname);