From 2c70fef12e35c8cedfaee7bad837a94fe314ac90 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 19 Jul 2022 17:58:27 +0200 Subject: [PATCH] bridge: don't reset vlan filtering parameters on external connections Fixes: 96fab7b46258 ('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 --- src/core/devices/nm-device-bridge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c index c1ca72381..638c0a5d0 100644 --- a/src/core/devices/nm-device-bridge.c +++ b/src/core/devices/nm-device-bridge.c @@ -1003,7 +1003,8 @@ attach_port(NMDevice *device, 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;