From cee2bdcc6eef14edafe7ebb72b76352f2bb66084 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Fri, 26 Jul 2024 11:31:48 +0200
Subject: [PATCH] bridge: reapply port VLANs only when necessary

Don't touch the bridge VLANs if they are already set.

(cherry picked from commit 447e50d74e73e97a67d3563754e2169965f92d57)
(cherry picked from commit 92b366545b6055a2a5928c219be46e733458ae69)
(cherry picked from commit f6e8344dfe0c806882a021dc2fa055c7eac62e0d)
(cherry picked from commit f9a02490087837f7655c7f96a23496d74429ab21)
---
 src/core/devices/nm-device-bridge.c | 35 ++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/core/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c
index d0109dc2ee..f5fcb342a5 100644
--- a/src/core/devices/nm-device-bridge.c
+++ b/src/core/devices/nm-device-bridge.c
@@ -13,6 +13,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
 #include "libnm-platform/nm-platform.h"
+#include "libnm-platform/nm-platform-utils.h"
 #include "nm-device-factory.h"
 #include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
@@ -856,14 +857,18 @@ merge_bridge_vlan_default_pvid(NMPlatformBridgeVlan *vlans, guint *num_vlans, gu
 void
 nm_device_reapply_bridge_port_vlans(NMDevice *device)
 {
+    NMDevice                     *self = device; /* for logging */
     NMSettingBridgePort          *s_bridge_port;
     NMDevice                     *controller;
     NMSettingBridge              *s_bridge;
     gs_unref_ptrarray GPtrArray  *tmp_vlans         = NULL;
     gs_free NMPlatformBridgeVlan *setting_vlans     = NULL;
+    gs_free NMPlatformBridgeVlan *plat_vlans        = NULL;
     guint                         num_setting_vlans = 0;
+    guint                         num_plat_vlans    = 0;
     NMPlatform                   *plat;
     int                           ifindex;
+    gboolean                      do_reapply;
 
     s_bridge_port = nm_device_get_applied_setting(device, NM_TYPE_SETTING_BRIDGE_PORT);
     if (!s_bridge_port)
@@ -896,9 +901,33 @@ nm_device_reapply_bridge_port_vlans(NMDevice *device)
     plat    = nm_device_get_platform(device);
     ifindex = nm_device_get_ifindex(device);
 
-    nm_platform_link_set_bridge_vlans(plat, ifindex, TRUE, NULL, 0);
-    if (num_setting_vlans > 0)
-        nm_platform_link_set_bridge_vlans(plat, ifindex, TRUE, setting_vlans, num_setting_vlans);
+    if (!nm_platform_link_get_bridge_vlans(plat, ifindex, &plat_vlans, &num_plat_vlans)) {
+        _LOGD(LOGD_DEVICE, "reapply-bridge-port-vlans: can't get current VLANs from platform");
+        do_reapply = TRUE;
+    } else {
+        nmp_utils_bridge_vlan_normalize(setting_vlans, &num_setting_vlans);
+        nmp_utils_bridge_vlan_normalize(plat_vlans, &num_plat_vlans);
+        if (!nmp_utils_bridge_normalized_vlans_equal(setting_vlans,
+                                                     num_setting_vlans,
+                                                     plat_vlans,
+                                                     num_plat_vlans)) {
+            _LOGD(LOGD_DEVICE, "reapply-bridge-port-vlans: VLANs in platform need reapply");
+            do_reapply = TRUE;
+        } else {
+            _LOGD(LOGD_DEVICE, "reapply-bridge-port-vlans: VLANs in platform didn't change");
+            do_reapply = FALSE;
+        }
+    }
+
+    if (do_reapply) {
+        nm_platform_link_set_bridge_vlans(plat, ifindex, TRUE, NULL, 0);
+        if (num_setting_vlans > 0)
+            nm_platform_link_set_bridge_vlans(plat,
+                                              ifindex,
+                                              TRUE,
+                                              setting_vlans,
+                                              num_setting_vlans);
+    }
 }
 
 static void