fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 11:50:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ethtool: add and use nm_ethtool_id_get_variant_type() helper

Browse source
This commit is contained in:
Thomas Haller 2022-11-08 18:45:43 +01:00
parent 7f22835328
commit a0370e0efa
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libnm-base/nm-ethtool-base.c
View file

@ -294,3 +294,15 @@ nm_ethtool_id_to_type(NMEthtoolID id)
return NM_ETHTOOL_TYPE_UNKNOWN;
}
const GVariantType *
nm_ethtool_id_get_variant_type(NMEthtoolID ethtool_id)
{
if (nm_ethtool_id_is_feature(ethtool_id) || nm_ethtool_id_is_pause(ethtool_id))
return G_VARIANT_TYPE_BOOLEAN;
if (nm_ethtool_id_is_coalesce(ethtool_id) || nm_ethtool_id_is_ring(ethtool_id))
return G_VARIANT_TYPE_UINT32;
return NULL;
}

2
src/libnm-base/nm-ethtool-base.h
View file

@ -21,6 +21,8 @@ const NMEthtoolData *nm_ethtool_data_get_by_optname(const char *optname);
NMEthtoolType nm_ethtool_id_to_type(NMEthtoolID id);
const GVariantType *nm_ethtool_id_get_variant_type(NMEthtoolID ethtool_id);
/****************************************************************************/
static inline NMEthtoolID

18
src/libnm-core-impl/nm-setting-ethtool.c
View file

@ -23,20 +23,6 @@
/*****************************************************************************/
static const GVariantType *
get_variant_type_from_ethtool_id(NMEthtoolID ethtool_id)
{
if (nm_ethtool_id_is_feature(ethtool_id) || nm_ethtool_id_is_pause(ethtool_id))
return G_VARIANT_TYPE_BOOLEAN;
if (nm_ethtool_id_is_coalesce(ethtool_id) || nm_ethtool_id_is_ring(ethtool_id))
return G_VARIANT_TYPE_UINT32;
return NULL;
}
/*****************************************************************************/
/**
* nm_ethtool_optname_is_feature:
* @optname: (allow-none): the option name to check
@ -302,7 +288,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
NMEthtoolID ethtool_id;
ethtool_id = nm_ethtool_id_get_by_name(optname);
variant_type = get_variant_type_from_ethtool_id(ethtool_id);
variant_type = nm_ethtool_id_get_variant_type(ethtool_id);
if (!variant_type) {
g_set_error_literal(error,
@ -365,7 +351,7 @@ get_variant_type(const NMSettInfoSetting *sett_info, const char *name, GError **
{
const GVariantType *variant_type;
variant_type = get_variant_type_from_ethtool_id(nm_ethtool_id_get_by_name(name));
variant_type = nm_ethtool_id_get_variant_type(nm_ethtool_id_get_by_name(name));
if (!variant_type) {
g_set_error(error,