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

luci-mod-network: allow wifi bridging with bridge or bridge vlan ifaces

Browse source 
Recent netifd automatically adds wireless devices as bridge ports if the
layer 2 device referenced by the "config interface" target network is a
Linux network bridge or a VLAN interface on top of a network bridge.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3b4c161e01)
This commit is contained in:
Jo-Philipp Wich 2021-03-17 10:45:04 +01:00 committed by Rafał Miłecki
parent 470848fac9
commit 482f342d25
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
View file

@ -987,8 +987,17 @@ return view.extend({
return net || network.addNetwork(name, { proto: 'none' }); return net || network.addNetwork(name, { proto: 'none' });
}, this, values[i])).then(L.bind(function(dev, net) { }, this, values[i])).then(L.bind(function(dev, net) {
if (net) { if (net) {
if (!net.isEmpty()) if (!net.isEmpty()) {
net.set('type', 'bridge'); var target_dev = net.getDevice();
/* Resolve parent interface of vlan */
while (target_dev && target_dev.getType() == 'vlan')
target_dev = target_dev.getParent();
if (!target_dev || target_dev.getType() != 'bridge')
net.set('type', 'bridge');
}
net.addDevice(dev); net.addDevice(dev);
} }
}, this, dev))); }, this, dev)));