colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
This commit is contained in:
Beniamino Galvani
2022-07-19 17:58:27 +02:00
parent e35f2494f8
commit 2c70fef12e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1003,7 +1003,8 @@ attach_port(NMDevice *device,
nm_assert(s_bridge); nm_assert(s_bridge);
s_port = nm_connection_get_setting_bridge_port(connection); 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)) { if (nm_setting_bridge_get_vlan_filtering(s_bridge)) {
gs_free const NMPlatformBridgeVlan **plat_vlans = NULL; gs_free const NMPlatformBridgeVlan **plat_vlans = NULL;