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

merge: branch 'bg/bridge-port-fix-reapply'

Browse Source 
bridge: fix reapplying port VLANs

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2240
This commit is contained in:
Beniamino Galvani
2025-07-14 13:04:00 +00:00
parent f655cd1cba 261fa8db33
commit bd41951f1d
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -735,6 +735,11 @@ merge_bridge_vlan_default_pvid(NMPlatformBridgeVlan *vlans, guint *num_vlans, gu
gboolean has_pvid = FALSE; gboolean has_pvid = FALSE;
guint i; guint i;
if (default_pvid == 0) {
/* default_pvid=0 means that the default PVID is disabled. No need to merge it. */
return vlans;
}
for (i = 0; i < *num_vlans; i++) { for (i = 0; i < *num_vlans; i++) {
if (vlans[i].pvid) { if (vlans[i].pvid) {
has_pvid = TRUE; has_pvid = TRUE;

7
src/core/devices/nm-device.c
View File

@@ -14050,6 +14050,13 @@ can_reapply_change(NMDevice *self,
goto out_fail; 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)) { if (nm_streq(setting_name, NM_SETTING_SRIOV_SETTING_NAME)) {
return nm_device_hash_check_invalid_keys(diffs, return nm_device_hash_check_invalid_keys(diffs,
NM_SETTING_SRIOV_SETTING_NAME, NM_SETTING_SRIOV_SETTING_NAME,