New upstream version 1.44.0 upstream/1.44.0

1 files changed, 3 insertions, 9 deletions

diff --git a/src/core/nm-l3-ipv6ll.c b/src/core/nm-l3-ipv6ll.c
index 0133ebe6..38aa98fc 100644
--- a/src/core/nm-l3-ipv6ll.c
+++ b/src/core/nm-l3-ipv6ll.c
@@ -420,9 +420,7 @@ _lladdr_handle_changed(NML3IPv6LL *self, gboolean force_commit)
                                 NM_DNS_PRIORITY_DEFAULT_NORMAL,
                                 NM_L3_ACD_DEFEND_TYPE_ALWAYS,
                                 0,
-                                /* Even if the address was removed from platform, it must
-                                 * be re-added, hence FORCE_ONCE. */
-                                NM_L3CFG_CONFIG_FLAGS_FORCE_ONCE,
+                                NM_L3CFG_CONFIG_FLAGS_NONE,
                                 NM_L3_CONFIG_MERGE_FLAGS_NONE))
             changed = TRUE;
     } else {
@@ -667,17 +665,13 @@ _nm_l3_ipv6ll_new(NML3Cfg                  *l3cfg,
     };
 
     if (self->addrgen.stable_type == NM_UTILS_STABLE_TYPE_NONE) {
-        char sbuf_token[sizeof(self->addrgen.token.iid) * 3];
+        char sbuf_token[INET6_ADDRSTRLEN];
 
         self->addrgen.token.iid = *token_iid;
         _LOGT("created: l3cfg=" NM_HASH_OBFUSCATE_PTR_FMT ", ifindex=%d, token=%s%s",
               NM_HASH_OBFUSCATE_PTR(l3cfg),
               nm_l3cfg_get_ifindex(l3cfg),
-              nm_utils_bin2hexstr_full(&self->addrgen.token.iid,
-                                       sizeof(self->addrgen.token.iid),
-                                       ':',
-                                       FALSE,
-                                       sbuf_token),
+              nm_utils_inet6_interface_identifier_to_token(&self->addrgen.token.iid, sbuf_token),
               self->assume ? ", assume" : "");
     } else {
         self->addrgen.stable_privacy.ifname     = g_strdup(ifname);