From c647c060d6dabefeb05f6be6c4af8778437d9a1e Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Tue, 8 Jul 2025 17:16:25 +0200 Subject: [PATCH] device: accept changes to the bond-port.vlans during reapply Commit c5d1e35f993e ('device: support reapplying bridge-port VLANs') didn't update can_reapply_change() to accept the "bridge-port.vlans" property during a reapply. So, it was only possible to change the bridge port VLANs by updating the "bridge.vlan-default-pvid" property and doing a reapply. Fix that. Fixes: c5d1e35f993e ('device: support reapplying bridge-port VLANs') (cherry picked from commit 261fa8db336e0571479567e2bda10dbf5d171b0a) --- src/core/devices/nm-device.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 892ad7fdb5..aca94055cd 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -14051,6 +14051,13 @@ can_reapply_change(NMDevice *self, goto out_fail; } + if (nm_streq(setting_name, NM_SETTING_BRIDGE_PORT_SETTING_NAME)) { + return nm_device_hash_check_invalid_keys(diffs, + NM_SETTING_BRIDGE_PORT_SETTING_NAME, + error, + NM_SETTING_BRIDGE_PORT_VLANS); + } + if (nm_streq(setting_name, NM_SETTING_SRIOV_SETTING_NAME)) { return nm_device_hash_check_invalid_keys(diffs, NM_SETTING_SRIOV_SETTING_NAME,