luci-base: network.js: ignore wireless ifname patterns on retrieving devices

Only treat the given identifier as Linux netdev name if we can find a
corresponding entry in the device info cache and do not consider strings
starting with "wlan", "ath" or "wl" to be existing devices.

This fixes incorrectly adding wireless sections as ifnames to network
interfaces when the wifi-iface section name begins with one of the
`iface_patterns_wireless` patterns.

Fixes: #5069
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d4092b15ce92cda2d7711b57b2251ebebef32b5c)

diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
index 80d413e4d4aafc269db5e6ca2ed56e63c2f27a46..725b90dfb6cc29323329bd29e0ed97aab052065f 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -1117,7 +1117,7 @@ Network = baseclass.extend(/** @lends LuCI.network.prototype */ {
                        if (name == null)
                                return null;
 
-                       if (_state.netdevs.hasOwnProperty(name) || isWifiIfname(name))
+                       if (_state.netdevs.hasOwnProperty(name))
                                return this.instantiateDevice(name);
 
                        var netid = getWifiNetidBySid(name);