New upstream version 1.54.2 upstream/1.54.2

1 files changed, 14 insertions, 3 deletions

diff --git a/src/libnm-platform/nm-platform.c b/src/libnm-platform/nm-platform.c
index fd966d2c..33c763c3 100644
--- a/src/libnm-platform/nm-platform.c
+++ b/src/libnm-platform/nm-platform.c
@@ -6560,6 +6560,8 @@ nm_platform_lnk_gre_to_string(const NMPlatformLnkGre *lnk, char *buf, gsize len)
 const char *
 nm_platform_lnk_hsr_to_string(const NMPlatformLnkHsr *lnk, char *buf, gsize len)
 {
+    char interlink_buf[30];
+
     if (!nm_utils_to_string_buffer_init_null(lnk, &buf, &len))
         return buf;
 
@@ -6569,12 +6571,17 @@ nm_platform_lnk_hsr_to_string(const NMPlatformLnkHsr *lnk, char *buf, gsize len)
                "port1 %d "
                "port2 %d "
                "supervision_address " NM_ETHER_ADDR_FORMAT_STR " multicast_spec %u "
-               "prp %s",
+               "prp %s "
+               "protocol_version %d"
+               "%s", /* interlink */
                lnk->port1,
                lnk->port2,
                NM_ETHER_ADDR_FORMAT_VAL(&lnk->supervision_address),
                lnk->multicast_spec,
-               lnk->prp ? "on" : "off");
+               lnk->prp ? "on" : "off",
+               lnk->protocol_version,
+               lnk->interlink ? nm_sprintf_buf(interlink_buf, " interlink %d", lnk->interlink)
+                              : "");
     return buf;
 }
 
@@ -8488,7 +8495,9 @@ nm_platform_lnk_hsr_hash_update(const NMPlatformLnkHsr *obj, NMHashState *h)
                         obj->port2,
                         obj->supervision_address,
                         obj->multicast_spec,
-                        NM_HASH_COMBINE_BOOLS(guint8, obj->prp));
+                        NM_HASH_COMBINE_BOOLS(guint8, obj->prp),
+                        obj->protocol_version,
+                        obj->interlink);
 }
 
 int
@@ -8500,6 +8509,8 @@ nm_platform_lnk_hsr_cmp(const NMPlatformLnkHsr *a, const NMPlatformLnkHsr *b)
     NM_CMP_FIELD_MEMCMP(a, b, supervision_address);
     NM_CMP_FIELD(a, b, multicast_spec);
     NM_CMP_FIELD_BOOL(a, b, prp);
+    NM_CMP_FIELD(a, b, protocol_version);
+    NM_CMP_FIELD(a, b, interlink);
     return 0;
 }