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

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

Browse source 
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 d4092b15ce)
This commit is contained in:
Jo-Philipp Wich 2021-11-10 11:51:42 +01:00
parent 6335d0fed2
commit 8bd4e78ff2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1117,7 +1117,7 @@ Network = baseclass.extend(/** @lends LuCI.network.prototype */ {
if (name == null) if (name == null)
return null; return null;
if (_state.netdevs.hasOwnProperty(name) || isWifiIfname(name)) if (_state.netdevs.hasOwnProperty(name))
return this.instantiateDevice(name); return this.instantiateDevice(name);
var netid = getWifiNetidBySid(name); var netid = getWifiNetidBySid(name);