fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-27 17:30:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bridge: don't reset vlan filtering parameters on external connections

Browse source 
Fixes: 96fab7b462 ('all: add vlan-filtering and vlan-default-pvid bridge properties')

https://bugzilla.redhat.com/show_bug.cgi?id=2107647
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1305
(cherry picked from commit 2c70fef12e)
(cherry picked from commit 4430e663c6)
This commit is contained in:
Beniamino Galvani 2022-07-19 17:58:27 +02:00
parent b43503b67b
commit 7f614dc88b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/devices/nm-device-bridge.c
View file

@ -949,7 +949,8 @@ enslave_slave(NMDevice *device, NMDevice *slave, NMConnection *connection, gbool
nm_assert(s_bridge);
s_port = nm_connection_get_setting_bridge_port(connection);
bridge_set_vlan_options(device, s_bridge);
if (!nm_device_sys_iface_state_is_external(device))
bridge_set_vlan_options(device, s_bridge);
if (nm_setting_bridge_get_vlan_filtering(s_bridge)) {
gs_free const NMPlatformBridgeVlan **plat_vlans = NULL;