diff options
author | Beniamino Galvani <bgalvani@redhat.com> | 2022-07-19 17:58:27 +0200 |
---|---|---|
committer | Beniamino Galvani <bgalvani@redhat.com> | 2022-07-26 09:00:43 +0200 |
commit | 2c70fef12e35c8cedfaee7bad837a94fe314ac90 (patch) | |
tree | 68d670dd3b138ef913ba48233c14c9466edf3440 | |
parent | e35f2494f86332e2c7f52bd09f3904ebbbf8e871 (diff) | |
download | NetworkManager-2c70fef12e35c8cedfaee7bad837a94fe314ac90.tar.gz |
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
-rw-r--r-- | src/core/devices/nm-device-bridge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c index c1ca723816..638c0a5d0a 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; |