From 98435a37a7139aa4bc1d494f7cc3cbdf2b9be597 Mon Sep 17 00:00:00 2001 From: Tobias Waldvogel Date: Thu, 14 Aug 2025 10:09:58 +0200 Subject: [PATCH] wifi-scripts: iface should be optional in wifi-vlan definition The option iface should be optional according to the description of /etc/config/wireless in order to avoid repeating the definition for each virtual interface. Signed-off-by: Tobias Waldvogel --- .../wifi-scripts/files/lib/netifd/wireless.uc | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/package/network/config/wifi-scripts/files/lib/netifd/wireless.uc b/package/network/config/wifi-scripts/files/lib/netifd/wireless.uc index f0dc762e19a..2103c9c3691 100644 --- a/package/network/config/wifi-scripts/files/lib/netifd/wireless.uc +++ b/package/network/config/wifi-scripts/files/lib/netifd/wireless.uc @@ -143,22 +143,24 @@ function config_init(uci) } for (let name, data in sections.vlan) { - if (!data.iface || !vifs[data.iface]) - continue; - - for (let vif in vifs[data.iface]) { - let dev = devices[vif.device]; - let handler = handlers[vif.device]; - if (!dev || !handler) + for (let iface, iface_vifs in vifs) { + if (data.iface && data.iface != iface) continue; - let config = parse_attribute_list(data, handler.vlan); + for (let vif in iface_vifs) { + let dev = devices[vif.device]; + let handler = handlers[vif.device]; + if (!dev || !handler) + continue; - let vlan = { - name, - config - }; - push(vif.vlan, vlan); + let config = parse_attribute_list(data, handler.vlan); + + let vlan = { + name, + config + }; + push(vif.vlan, vlan); + } } } -- 2.47.3