summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-05-14 09:16:34 +0200
committerThomas Haller <thaller@redhat.com>2020-05-22 15:58:09 +0200
commit482f9c574edf1e5ac37dc1bb38b9a24e810ab98b (patch)
tree956b7a0a563a05c260912bcb39e1a2127dc1d96e
parent0533ab3c795a97674ce0ba49f469eaf173cb47e2 (diff)
downloadNetworkManager-482f9c574edf1e5ac37dc1bb38b9a24e810ab98b.tar.gz
libnm: deprecated nm_setting_ethtool_*_feature() API
These are just aliases for the more general nm_setting_option_*() API.
-rw-r--r--libnm-core/nm-setting-ethtool.c8
-rw-r--r--libnm-core/nm-setting-ethtool.h12
2 files changed, 16 insertions, 4 deletions
diff --git a/libnm-core/nm-setting-ethtool.c b/libnm-core/nm-setting-ethtool.c
index fd749780ca..0057e10e0c 100644
--- a/libnm-core/nm-setting-ethtool.c
+++ b/libnm-core/nm-setting-ethtool.c
@@ -135,6 +135,8 @@ _notify_attributes (NMSettingEthtool *self)
* is enabled, disabled, or left untouched.
*
* Since: 1.14
+ *
+ * Deprecated: 1.26: use nm_setting_option_get_boolean() instead.
*/
NMTernary
nm_setting_ethtool_get_feature (NMSettingEthtool *setting,
@@ -165,6 +167,8 @@ nm_setting_ethtool_get_feature (NMSettingEthtool *setting,
* nm_ethtool_optname_is_feature().
*
* Since: 1.14
+ *
+ * Deprecated: 1.26: use nm_setting_option_set() or nm_setting_option_set_boolean() instead.
*/
void
nm_setting_ethtool_set_feature (NMSettingEthtool *setting,
@@ -190,6 +194,8 @@ nm_setting_ethtool_set_feature (NMSettingEthtool *setting,
* Clears all offload features settings
*
* Since: 1.14
+ *
+ * Deprecated: 1.26: use nm_setting_option_clear_by_name() with nm_ethtool_optname_is_feature() predicate instead.
*/
void
nm_setting_ethtool_clear_features (NMSettingEthtool *setting)
@@ -456,6 +462,8 @@ nm_setting_ethtool_clear_ring_all (NMSettingEthtool *setting)
* @setting and may get invalidated when @setting gets modified.
*
* Since: 1.20
+ *
+ * Deprecated: 1.26: use nm_setting_option_get_all_names() instead.
*/
const char **
nm_setting_ethtool_get_optnames (NMSettingEthtool *setting,
diff --git a/libnm-core/nm-setting-ethtool.h b/libnm-core/nm-setting-ethtool.h
index 795b3a38dc..6bb8edc87a 100644
--- a/libnm-core/nm-setting-ethtool.h
+++ b/libnm-core/nm-setting-ethtool.h
@@ -129,20 +129,24 @@ NMSetting *nm_setting_ethtool_new (void);
/*****************************************************************************/
+NM_AVAILABLE_IN_1_20
+NM_DEPRECATED_IN_1_26
+const char ** nm_setting_ethtool_get_optnames (NMSettingEthtool *setting,
+ guint *out_length);
+
NM_AVAILABLE_IN_1_14
+NM_DEPRECATED_IN_1_26
NMTernary nm_setting_ethtool_get_feature (NMSettingEthtool *setting,
const char *optname);
NM_AVAILABLE_IN_1_14
+NM_DEPRECATED_IN_1_26
void nm_setting_ethtool_set_feature (NMSettingEthtool *setting,
const char *optname,
NMTernary value);
NM_AVAILABLE_IN_1_14
+NM_DEPRECATED_IN_1_26
void nm_setting_ethtool_clear_features (NMSettingEthtool *setting);
-NM_AVAILABLE_IN_1_20
-const char ** nm_setting_ethtool_get_optnames (NMSettingEthtool *setting,
- guint *out_length);
-
NM_AVAILABLE_IN_1_26
gboolean nm_setting_ethtool_get_coalesce (NMSettingEthtool *setting,
const char *optname,