From 8b663587f931aae5e3dcdccc6ba5b90a9d858076 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 17 Jun 2021 08:58:15 +0200 Subject: [PATCH] luci-mod-network: only consider bridge vlans belonging to the current device In case multiple bridges with bridge vlans are declared, LuCI did not correctly filter the VLANs to show only the ones belonging to the bridge being configured currently. Signed-off-by: Jo-Philipp Wich (cherry picked from commit f6f1eacb012b0364940c1dc9b9392fc0e60405b9) --- .../htdocs/luci-static/resources/tools/network.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js index 2ebf3afe02..ce6388b6cd 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js @@ -968,6 +968,9 @@ return baseclass.extend({ }); uci.sections('network', 'bridge-vlan', function(bvs) { + if (uci.get('network', s.section, 'name') != bvs.device) + return; + L.toArray(bvs.ports).forEach(function(portspec) { var m = portspec.match(/^([^:]+)(?::[ut*]+)?$/);