Update upstream source from tag 'upstream/1.29.90'

Update to upstream version '1.29.90'
with Debian dir 90df6d97476cc3200c410f3f3603b87396175c7a

1 files changed, 12 insertions, 13 deletions

diff --git a/libnm-core/nm-team-utils.c b/libnm-core/nm-team-utils.c
index 2f1fba33..b7da35aa 100644
--- a/libnm-core/nm-team-utils.c
+++ b/libnm-core/nm-team-utils.c
@@ -1,11 +1,11 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
  * Copyright (C) 2019 Red Hat, Inc.
  */
 
 #define NM_VALUE_TYPE_DEFINE_FUNCTIONS
 
-#include "nm-default.h"
+#include "libnm-core/nm-default-libnm-core.h"
 
 #include "nm-team-utils.h"
 
@@ -524,10 +524,10 @@ _team_attr_data_cmp(const TeamAttrData *attr_data,
         v_ptrarray_a = *((const GPtrArray *const *) val_a);
         v_ptrarray_b = *((const GPtrArray *const *) val_b);
         NM_CMP_RETURN(
-            _nm_utils_strv_cmp_n(v_ptrarray_a ? (const char *const *) v_ptrarray_a->pdata : NULL,
-                                 v_ptrarray_a ? v_ptrarray_a->len : 0u,
-                                 v_ptrarray_b ? (const char *const *) v_ptrarray_b->pdata : NULL,
-                                 v_ptrarray_b ? v_ptrarray_b->len : 0u));
+            nm_utils_strv_cmp_n(v_ptrarray_a ? (const char *const *) v_ptrarray_a->pdata : NULL,
+                                v_ptrarray_a ? v_ptrarray_a->len : 0u,
+                                v_ptrarray_b ? (const char *const *) v_ptrarray_b->pdata : NULL,
+                                v_ptrarray_b ? v_ptrarray_b->len : 0u));
     } else
         nm_assert_not_reached();
     return 0;
@@ -1136,13 +1136,12 @@ _team_setting_value_master_runner_tx_hash_set_list(NMTeamSetting *    self,
     gboolean                                changed;
     guint                                   i;
 
-    if (_nm_utils_strv_cmp_n(self->d.master.runner_tx_hash
-                                 ? (const char *const *) self->d.master.runner_tx_hash->pdata
-                                 : NULL,
-                             self->d.master.runner_tx_hash ? self->d.master.runner_tx_hash->len
-                                                           : 0u,
-                             arr,
-                             len)
+    if (nm_utils_strv_cmp_n(self->d.master.runner_tx_hash
+                                ? (const char *const *) self->d.master.runner_tx_hash->pdata
+                                : NULL,
+                            self->d.master.runner_tx_hash ? self->d.master.runner_tx_hash->len : 0u,
+                            arr,
+                            len)
         == 0) {
         changed = FALSE;
         goto out;