summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2022-07-29 12:35:03 +0200
committerLubomir Rintel <lkundrak@v3.sk>2022-07-29 12:35:03 +0200
commit021f31d933adc41415146d71a7d0eec56ba3d329 (patch)
tree6f505f11d304296bb53264a8766fce6f63cad7c9
parent7864e75e96582d0bac5c56669b2294e8fac473b6 (diff)
bridge: fix reapply of non-bridge propertieslr/bridge-reapply-fix
Return was ommited in a branch that delegates settings check to a parent class, resulting in a bridge property check applied incorrectly. Fixes: commit 8e8fed433f22 ('bridge: add reapply support')
-rw-r--r--src/core/devices/nm-device-bridge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c
index 638c0a5d0a..f92aa46bcb 100644
--- a/src/core/devices/nm-device-bridge.c
+++ b/src/core/devices/nm-device-bridge.c
@@ -1162,7 +1162,7 @@ can_reapply_change(NMDevice *device,
{
/* Delegate changes to other settings to parent class */
if (!nm_streq(setting_name, NM_SETTING_BRIDGE_SETTING_NAME)) {
- NM_DEVICE_CLASS(nm_device_bridge_parent_class)
+ return NM_DEVICE_CLASS(nm_device_bridge_parent_class)
->can_reapply_change(device, setting_name, s_old, s_new, diffs, error);
}