Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest

1 files changed, 7 insertions, 7 deletions

diff --git a/libnm-core/nm-setting-ethtool.c b/libnm-core/nm-setting-ethtool.c
index 1c7fde65..f2c6d15e 100644
--- a/libnm-core/nm-setting-ethtool.c
+++ b/libnm-core/nm-setting-ethtool.c
@@ -1,14 +1,14 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm-core/nm-default-libnm-core.h"
 
 #include "nm-setting-ethtool.h"
 
 #include "nm-setting-private.h"
-#include "nm-libnm-core-intern/nm-ethtool-utils.h"
+#include "nm-base/nm-ethtool-base.h"
 
 /*****************************************************************************/
 
@@ -195,7 +195,7 @@ nm_setting_ethtool_clear_features(NMSettingEthtool *setting)
 guint
 nm_setting_ethtool_init_features(
     NMSettingEthtool *setting,
-    NMTernary *       requested /* indexed by NMEthtoolID - _NM_ETHTOOL_ID_FEATURE_FIRST */)
+    NMOptionBool *    requested /* indexed by NMEthtoolID - _NM_ETHTOOL_ID_FEATURE_FIRST */)
 {
     GHashTable *   hash;
     GHashTableIter iter;
@@ -208,7 +208,7 @@ nm_setting_ethtool_init_features(
     nm_assert(requested);
 
     for (i = 0; i < _NM_ETHTOOL_ID_FEATURE_NUM; i++)
-        requested[i] = NM_TERNARY_DEFAULT;
+        requested[i] = NM_OPTION_BOOL_DEFAULT;
 
     hash = _nm_setting_option_hash(NM_SETTING(setting), FALSE);
     if (!hash)
@@ -224,7 +224,7 @@ nm_setting_ethtool_init_features(
             continue;
 
         requested[_NM_ETHTOOL_ID_FEATURE_AS_IDX(ethtool_id)] =
-            g_variant_get_boolean(variant) ? NM_TERNARY_TRUE : NM_TERNARY_FALSE;
+            g_variant_get_boolean(variant) ? NM_OPTION_BOOL_TRUE : NM_OPTION_BOOL_FALSE;
         n_req++;
     }
 
@@ -254,7 +254,7 @@ const char **
 nm_setting_ethtool_get_optnames(NMSettingEthtool *setting, guint *out_length)
 {
     const char *const *names;
-    guint              len;
+    guint              len = 0;
 
     g_return_val_if_fail(NM_IS_SETTING_ETHTOOL(setting), NULL);