system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-04 15:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: branch 'feature-ethtool-eee'

Browse source 
ethtool: introduce EEE support

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1777
This commit is contained in:
Beniamino Galvani 2023-11-06 08:38:18 +00:00
parent 3842418512 3165d9a2de
commit a8b23db4d6
20 changed files with 318 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
src/core/devices/nm-device.c
View file

@ -305,6 +305,7 @@ typedef struct {
NMEthtoolRingState *ring;
NMEthtoolPauseState *pause;
NMEthtoolChannelsState *channels;
NMEthtoolEEEState *eee;
} EthtoolState;
typedef enum {
@ -2722,6 +2723,25 @@ _ethtool_pause_reset(NMDevice *self, NMPlatform *platform, EthtoolState *ethtool
_LOGD(LOGD_DEVICE, "ethtool: pause settings successfully reset");
}
static void
_ethtool_eee_reset(NMDevice *self, NMPlatform *platform, EthtoolState *ethtool_state)
{
gs_free NMEthtoolEEEState *eee = NULL;
nm_assert(NM_IS_DEVICE(self));
nm_assert(NM_IS_PLATFORM(platform));
nm_assert(ethtool_state);
eee = g_steal_pointer(&ethtool_state->eee);
if (!eee)
return;
if (!nm_platform_ethtool_set_eee(platform, ethtool_state->ifindex, eee))
_LOGW(LOGD_DEVICE, "ethtool: failure resetting eee settings");
else
_LOGD(LOGD_DEVICE, "ethtool: eee settings successfully reset");
}
static void
_ethtool_pause_set(NMDevice *self,
NMPlatform *platform,
@ -2810,6 +2830,73 @@ _ethtool_pause_set(NMDevice *self,
_LOGD(LOGD_DEVICE, "ethtool: pause settings successfully set");
}
static void
_ethtool_eee_set(NMDevice *self,
NMPlatform *platform,
EthtoolState *ethtool_state,
NMSettingEthtool *s_ethtool)
{
NMEthtoolEEEState eee_old;
NMEthtoolEEEState eee_new;
GHashTable *hash;
GHashTableIter iter;
const char *name;
GVariant *variant;
gboolean has_old = FALSE;
NMTernary eee = NM_TERNARY_DEFAULT;
nm_assert(NM_IS_DEVICE(self));
nm_assert(NM_IS_PLATFORM(platform));
nm_assert(NM_IS_SETTING_ETHTOOL(s_ethtool));
nm_assert(ethtool_state);
nm_assert(!ethtool_state->eee);
hash = _nm_setting_option_hash(NM_SETTING(s_ethtool), FALSE);
if (!hash)
return;
g_hash_table_iter_init(&iter, hash);
while (g_hash_table_iter_next(&iter, (gpointer *) &name, (gpointer *) &variant)) {
NMEthtoolID ethtool_id = nm_ethtool_id_get_by_name(name);
if (!nm_ethtool_id_is_eee(ethtool_id))
continue;
nm_assert(g_variant_is_of_type(variant, G_VARIANT_TYPE_BOOLEAN));
if (!has_old) {
if (!nm_platform_ethtool_get_link_eee(platform, ethtool_state->ifindex, &eee_old)) {
_LOGW(LOGD_DEVICE,
"ethtool: failure setting eee options (cannot read "
"existing setting)");
return;
}
has_old = TRUE;
}
if (ethtool_id == NM_ETHTOOL_ID_EEE_ENABLED)
eee = g_variant_get_boolean(variant);
else
nm_assert_not_reached();
}
if (!has_old)
return;
eee_new = eee_old;
if (eee != NM_TERNARY_DEFAULT)
eee_new.enabled = !!eee;
ethtool_state->eee = nm_memdup(&eee_old, sizeof(eee_old));
if (!nm_platform_ethtool_set_eee(platform, ethtool_state->ifindex, &eee_new)) {
_LOGW(LOGD_DEVICE, "ethtool: failure setting eee settings");
return;
}
_LOGD(LOGD_DEVICE, "ethtool: eee settings successfully set");
}
static void
_ethtool_state_reset(NMDevice *self)
{
@ -2825,6 +2912,7 @@ _ethtool_state_reset(NMDevice *self)
_ethtool_ring_reset(self, platform, ethtool_state);
_ethtool_pause_reset(self, platform, ethtool_state);
_ethtool_channels_reset(self, platform, ethtool_state);
_ethtool_eee_reset(self, platform, ethtool_state);
}
static void
@ -2860,9 +2948,10 @@ _ethtool_state_set(NMDevice *self)
_ethtool_ring_set(self, platform, ethtool_state, s_ethtool);
_ethtool_pause_set(self, platform, ethtool_state, s_ethtool);
_ethtool_channels_set(self, platform, ethtool_state, s_ethtool);
_ethtool_eee_set(self, platform, ethtool_state, s_ethtool);
if (ethtool_state->features || ethtool_state->coalesce || ethtool_state->ring
|| ethtool_state->pause || ethtool_state->channels)
|| ethtool_state->pause || ethtool_state->channels || ethtool_state->eee)
priv->ethtool_state = g_steal_pointer(&ethtool_state);
}

12
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
View file

@ -1439,6 +1439,18 @@ write_ethtool_setting(NMConnection *connection, shvarFile *ifcfg, GError **error
}
}
is_first = TRUE;
for (ethtool_id = _NM_ETHTOOL_ID_EEE_FIRST; ethtool_id <= _NM_ETHTOOL_ID_EEE_LAST;
ethtool_id++) {
if (nm_setting_option_get_boolean(NM_SETTING(s_ethtool),
nm_ethtool_data[ethtool_id]->optname,
&b)) {
nm_sprintf_buf(prop_name, "ethtool.%s", nm_ethtool_data[ethtool_id]->optname);
set_error_unsupported(error, connection, prop_name, FALSE);
return FALSE;
}
}
if (!any_option) {
/* Write an empty dummy "-A" option without arguments. This is to
* ensure that the reader will create an (all default) NMSettingEthtool.

2
src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View file

@ -3623,7 +3623,7 @@ test_roundtrip_ethtool(void)
optname = nm_ethtool_data[ethtool_id]->optname;
vtype = nm_ethtool_id_get_variant_type(ethtool_id);
if (nm_ethtool_optname_is_channels(optname)) {
if (nm_ethtool_optname_is_channels(optname) || nm_ethtool_optname_is_eee(optname)) {
/* Not supported */
continue;
}

13
src/libnm-base/nm-base.h
View file

@ -117,7 +117,11 @@ typedef enum {
NM_ETHTOOL_ID_PAUSE_TX,
_NM_ETHTOOL_ID_PAUSE_LAST = NM_ETHTOOL_ID_PAUSE_TX,
_NM_ETHTOOL_ID_RING_FIRST = _NM_ETHTOOL_ID_PAUSE_LAST + 1,
_NM_ETHTOOL_ID_EEE_FIRST = _NM_ETHTOOL_ID_PAUSE_LAST + 1,
NM_ETHTOOL_ID_EEE_ENABLED = _NM_ETHTOOL_ID_EEE_FIRST,
_NM_ETHTOOL_ID_EEE_LAST = NM_ETHTOOL_ID_EEE_ENABLED,
_NM_ETHTOOL_ID_RING_FIRST = _NM_ETHTOOL_ID_EEE_LAST + 1,
NM_ETHTOOL_ID_RING_RX = _NM_ETHTOOL_ID_RING_FIRST,
NM_ETHTOOL_ID_RING_RX_JUMBO,
NM_ETHTOOL_ID_RING_RX_MINI,
@ -153,6 +157,7 @@ typedef enum {
NM_ETHTOOL_TYPE_RING,
NM_ETHTOOL_TYPE_PAUSE,
NM_ETHTOOL_TYPE_CHANNELS,
NM_ETHTOOL_TYPE_EEE,
} NMEthtoolType;
/****************************************************************************/
@ -187,6 +192,12 @@ nm_ethtool_id_is_channels(NMEthtoolID id)
return id >= _NM_ETHTOOL_ID_CHANNELS_FIRST && id <= _NM_ETHTOOL_ID_CHANNELS_LAST;
}
static inline gboolean
nm_ethtool_id_is_eee(NMEthtoolID id)
{
return id >= _NM_ETHTOOL_ID_EEE_FIRST && id <= _NM_ETHTOOL_ID_EEE_LAST;
}
/*****************************************************************************/
typedef enum {

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

@ -41,6 +41,7 @@ const NMEthtoolData *const nm_ethtool_data[_NM_ETHTOOL_ID_NUM + 1] = {
ETHT_DATA(COALESCE_TX_USECS_HIGH),
ETHT_DATA(COALESCE_TX_USECS_IRQ),
ETHT_DATA(COALESCE_TX_USECS_LOW),
ETHT_DATA(EEE_ENABLED),
ETHT_DATA(FEATURE_ESP_HW_OFFLOAD),
ETHT_DATA(FEATURE_ESP_TX_CSUM_HW_OFFLOAD),
ETHT_DATA(FEATURE_FCOE_MTU),
@ -141,6 +142,7 @@ static const guint8 _by_name[_NM_ETHTOOL_ID_NUM] = {
NM_ETHTOOL_ID_COALESCE_TX_USECS_HIGH,
NM_ETHTOOL_ID_COALESCE_TX_USECS_IRQ,
NM_ETHTOOL_ID_COALESCE_TX_USECS_LOW,
NM_ETHTOOL_ID_EEE_ENABLED,
NM_ETHTOOL_ID_FEATURE_ESP_HW_OFFLOAD,
NM_ETHTOOL_ID_FEATURE_ESP_TX_CSUM_HW_OFFLOAD,
NM_ETHTOOL_ID_FEATURE_FCOE_MTU,
@ -301,6 +303,8 @@ nm_ethtool_id_to_type(NMEthtoolID id)
return NM_ETHTOOL_TYPE_PAUSE;
if (nm_ethtool_id_is_channels(id))
return NM_ETHTOOL_TYPE_CHANNELS;
if (nm_ethtool_id_is_eee(id))
return NM_ETHTOOL_TYPE_EEE;
return NM_ETHTOOL_TYPE_UNKNOWN;
}
@ -311,6 +315,7 @@ nm_ethtool_id_get_variant_type(NMEthtoolID ethtool_id)
switch (nm_ethtool_id_to_type(ethtool_id)) {
case NM_ETHTOOL_TYPE_FEATURE:
case NM_ETHTOOL_TYPE_PAUSE:
case NM_ETHTOOL_TYPE_EEE:
return G_VARIANT_TYPE_BOOLEAN;
case NM_ETHTOOL_TYPE_CHANNELS:
case NM_ETHTOOL_TYPE_COALESCE:

1
src/libnm-base/nm-ethtool-utils-base.h
View file

@ -109,6 +109,7 @@ G_BEGIN_DECLS
#define NM_ETHTOOL_OPTNAME_CHANNELS_OTHER "channels-other"
#define NM_ETHTOOL_OPTNAME_CHANNELS_COMBINED "channels-combined"
#define NM_ETHTOOL_OPTNAME_EEE_ENABLED "eee"
/*****************************************************************************/
G_END_DECLS

1
src/libnm-client-impl/libnm.ver
View file

@ -1948,4 +1948,5 @@ libnm_1_46_0 {
global:
nm_access_point_get_bandwidth;
nm_ethtool_optname_is_channels;
nm_ethtool_optname_is_eee;
} libnm_1_44_0;

1
src/libnm-client-public/nm-ethtool-utils.h
View file

@ -109,6 +109,7 @@ G_BEGIN_DECLS
#define NM_ETHTOOL_OPTNAME_CHANNELS_OTHER "channels-other"
#define NM_ETHTOOL_OPTNAME_CHANNELS_COMBINED "channels-combined"
#define NM_ETHTOOL_OPTNAME_EEE_ENABLED "eee"
/*****************************************************************************/
G_END_DECLS

4
src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in
View file

@ -1276,6 +1276,10 @@
dbus-type="b"
is-setting-option="1"
/>
<property name="eee"
dbus-type="b"
is-setting-option="1"
/>
<property name="ring-rx"
dbus-type="u"
is-setting-option="1"

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

@ -91,6 +91,21 @@ nm_ethtool_optname_is_channels(const char *optname)
return optname && nm_ethtool_id_is_channels(nm_ethtool_id_get_by_name(optname));
}
/**
* nm_ethtool_optname_is_eee:
* @optname: (nullable): the option name to check
*
* Checks whether @optname is a valid option name for an eee setting.
*
* Returns: %TRUE, if @optname is valid
*
* Since: 1.46
*/
gboolean
nm_ethtool_optname_is_eee(const char *optname)
{
return optname && nm_ethtool_id_is_eee(nm_ethtool_id_get_by_name(optname));
}
/**
* nm_ethtool_optname_is_pause:
* @optname: (nullable): the option name to check

74
src/libnm-core-impl/tests/test-setting.c
View file

@ -2303,6 +2303,79 @@ test_ethtool_pause(void)
g_assert_true(out_value);
}
static void
test_ethtool_eee(void)
{
gs_unref_object NMConnection *con = NULL;
gs_unref_object NMConnection *con2 = NULL;
gs_unref_object NMConnection *con3 = NULL;
gs_unref_variant GVariant *variant = NULL;
gs_free_error GError *error = NULL;
nm_auto_unref_keyfile GKeyFile *keyfile = NULL;
NMSettingConnection *s_con;
NMSettingEthtool *s_ethtool;
NMSettingEthtool *s_ethtool2;
NMSettingEthtool *s_ethtool3;
gboolean out_value;
con =
nmtst_create_minimal_connection("ethtool-eee", NULL, NM_SETTING_WIRED_SETTING_NAME, &s_con);
s_ethtool = NM_SETTING_ETHTOOL(nm_setting_ethtool_new());
nm_connection_add_setting(con, NM_SETTING(s_ethtool));
nm_setting_option_set_boolean(NM_SETTING(s_ethtool), NM_ETHTOOL_OPTNAME_EEE_ENABLED, FALSE);
g_assert_true(nm_setting_option_get_boolean(NM_SETTING(s_ethtool),
NM_ETHTOOL_OPTNAME_EEE_ENABLED,
&out_value));
g_assert_true(!out_value);
nmtst_connection_normalize(con);
variant = nm_connection_to_dbus(con, NM_CONNECTION_SERIALIZE_ALL);
con2 = nm_simple_connection_new_from_dbus(variant, &error);
nmtst_assert_success(con2, error);
s_ethtool2 = NM_SETTING_ETHTOOL(nm_connection_get_setting(con2, NM_TYPE_SETTING_ETHTOOL));
g_assert_true(nm_setting_option_get_boolean(NM_SETTING(s_ethtool2),
NM_ETHTOOL_OPTNAME_EEE_ENABLED,
&out_value));
g_assert_true(!out_value);
nmtst_assert_connection_verifies_without_normalization(con2);
nmtst_assert_connection_equals(con, FALSE, con2, FALSE);
con2 = nm_simple_connection_new_from_dbus(variant, &error);
nmtst_assert_success(con2, error);
keyfile = nm_keyfile_write(con, NM_KEYFILE_HANDLER_FLAGS_NONE, NULL, NULL, &error);
nmtst_assert_success(keyfile, error);
con3 = nm_keyfile_read(keyfile,
"/ignored/current/working/directory/for/loading/relative/paths",
NM_KEYFILE_HANDLER_FLAGS_NONE,
NULL,
NULL,
&error);
nmtst_assert_success(con3, error);
nm_keyfile_read_ensure_id(con3, "unused-because-already-has-id");
nm_keyfile_read_ensure_uuid(con3, "unused-because-already-has-uuid");
nmtst_connection_normalize(con3);
nmtst_assert_connection_equals(con, FALSE, con3, FALSE);
s_ethtool3 = NM_SETTING_ETHTOOL(nm_connection_get_setting(con3, NM_TYPE_SETTING_ETHTOOL));
g_assert_true(nm_setting_option_get_boolean(NM_SETTING(s_ethtool3),
NM_ETHTOOL_OPTNAME_EEE_ENABLED,
&out_value));
g_assert_true(!out_value);
}
/*****************************************************************************/
static void
@ -5326,6 +5399,7 @@ main(int argc, char **argv)
g_test_add_func("/libnm/settings/ethtool/coalesce", test_ethtool_coalesce);
g_test_add_func("/libnm/settings/ethtool/ring", test_ethtool_ring);
g_test_add_func("/libnm/settings/ethtool/pause", test_ethtool_pause);
g_test_add_func("/libnm/settings/ethtool/eee", test_ethtool_eee);
g_test_add_func("/libnm/settings/6lowpan/1", test_6lowpan_1);

3
src/libnm-core-public/nm-setting-ethtool.h
View file

@ -29,6 +29,9 @@ gboolean nm_ethtool_optname_is_pause(const char *optname);
NM_AVAILABLE_IN_1_46
gboolean nm_ethtool_optname_is_channels(const char *optname);
NM_AVAILABLE_IN_1_46
gboolean nm_ethtool_optname_is_eee(const char *optname);
/*****************************************************************************/
#define NM_TYPE_SETTING_ETHTOOL (nm_setting_ethtool_get_type())

59
src/libnm-platform/nm-platform-utils.c
View file

@ -1161,6 +1161,35 @@ nmp_utils_ethtool_get_pause(int ifindex, NMEthtoolPauseState *pause)
return TRUE;
}
gboolean
nmp_utils_ethtool_get_eee(int ifindex, NMEthtoolEEEState *eee)
{
struct ethtool_eee eth_data;
nm_auto_socket_handle SocketHandle shandle = SOCKET_HANDLE_INIT(ifindex);
g_return_val_if_fail(ifindex > 0, FALSE);
g_return_val_if_fail(eee, FALSE);
eth_data.cmd = ETHTOOL_GEEE;
if (_ethtool_call_handle(&shandle, &eth_data, sizeof(struct ethtool_eee)) != 0) {
nm_log_trace(LOGD_PLATFORM,
"ethtool[%d]: %s: failure getting eee settings",
ifindex,
"get-eee");
return FALSE;
}
*eee = (NMEthtoolEEEState){
.enabled = eth_data.eee_enabled == 1,
};
nm_log_trace(LOGD_PLATFORM,
"ethtool[%d]: %s: retrieved kernel eee settings",
ifindex,
"get-eee");
return TRUE;
}
gboolean
nmp_utils_ethtool_set_pause(int ifindex, const NMEthtoolPauseState *pause)
{
@ -1188,6 +1217,36 @@ nmp_utils_ethtool_set_pause(int ifindex, const NMEthtoolPauseState *pause)
return TRUE;
}
gboolean
nmp_utils_ethtool_set_eee(int ifindex, const NMEthtoolEEEState *eee)
{
struct ethtool_eee eth_data;
nm_auto_socket_handle SocketHandle shandle = SOCKET_HANDLE_INIT(ifindex);
g_return_val_if_fail(ifindex > 0, FALSE);
g_return_val_if_fail(eee, FALSE);
eth_data.cmd = ETHTOOL_GEEE;
if (_ethtool_call_handle(&shandle, &eth_data, sizeof(struct ethtool_eee)) != 0) {
nm_log_trace(LOGD_PLATFORM,
"ethtool[%d]: %s: failure getting eee settings",
ifindex,
"get-eee");
return FALSE;
}
eth_data.cmd = ETHTOOL_SEEE, eth_data.eee_enabled = eee->enabled ? 1 : 0;
if (_ethtool_call_handle(&shandle, &eth_data, sizeof(struct ethtool_eee)) != 0) {
nm_log_trace(LOGD_PLATFORM,
"ethtool[%d]: %s: failure setting eee settings",
ifindex,
"set-eee");
return FALSE;
}
nm_log_trace(LOGD_PLATFORM, "ethtool[%d]: %s: set kernel eee settings", ifindex, "set-eee");
return TRUE;
}
/*****************************************************************************/
gboolean

4
src/libnm-platform/nm-platform-utils.h
View file

@ -62,6 +62,10 @@ gboolean nmp_utils_ethtool_get_pause(int ifindex, NMEthtoolPauseState *pause);
gboolean nmp_utils_ethtool_set_pause(int ifindex, const NMEthtoolPauseState *pause);
gboolean nmp_utils_ethtool_get_eee(int ifindex, NMEthtoolEEEState *eee);
gboolean nmp_utils_ethtool_set_eee(int ifindex, const NMEthtoolEEEState *eee);
/*****************************************************************************/
gboolean nmp_utils_mii_supports_carrier_detect(int ifindex);

20
src/libnm-platform/nm-platform.c
View file

@ -3628,6 +3628,17 @@ nm_platform_ethtool_get_link_pause(NMPlatform *self, int ifindex, NMEthtoolPause
return nmp_utils_ethtool_get_pause(ifindex, pause);
}
gboolean
nm_platform_ethtool_get_link_eee(NMPlatform *self, int ifindex, NMEthtoolEEEState *eee)
{
_CHECK_SELF_NETNS(self, klass, netns, FALSE);
g_return_val_if_fail(ifindex > 0, FALSE);
g_return_val_if_fail(eee, FALSE);
return nmp_utils_ethtool_get_eee(ifindex, eee);
}
gboolean
nm_platform_ethtool_set_pause(NMPlatform *self, int ifindex, const NMEthtoolPauseState *pause)
{
@ -3638,6 +3649,15 @@ nm_platform_ethtool_set_pause(NMPlatform *self, int ifindex, const NMEthtoolPaus
return nmp_utils_ethtool_set_pause(ifindex, pause);
}
gboolean
nm_platform_ethtool_set_eee(NMPlatform *self, int ifindex, const NMEthtoolEEEState *eee)
{
_CHECK_SELF_NETNS(self, klass, netns, FALSE);
g_return_val_if_fail(ifindex > 0, FALSE);
return nmp_utils_ethtool_set_eee(ifindex, eee);
}
/*****************************************************************************/
const NMDedupMultiHeadEntry *

4
src/libnm-platform/nm-platform.h
View file

@ -2578,9 +2578,13 @@ gboolean nm_platform_ethtool_set_channels(NMPlatform *self,
gboolean
nm_platform_ethtool_get_link_pause(NMPlatform *self, int ifindex, NMEthtoolPauseState *pause);
gboolean nm_platform_ethtool_get_link_eee(NMPlatform *self, int ifindex, NMEthtoolEEEState *eee);
gboolean
nm_platform_ethtool_set_pause(NMPlatform *self, int ifindex, const NMEthtoolPauseState *pause);
gboolean nm_platform_ethtool_set_eee(NMPlatform *self, int ifindex, const NMEthtoolEEEState *eee);
void nm_platform_ip4_dev_route_blacklist_set(NMPlatform *self,
int ifindex,
GPtrArray *ip4_dev_route_blacklist);

4
src/libnm-platform/nmp-base.h
View file

@ -119,6 +119,10 @@ typedef struct {
guint32 combined;
} NMEthtoolChannelsState;
typedef struct {
bool enabled : 1;
} NMEthtoolEEEState;
/*****************************************************************************/
typedef struct _NMPNetns NMPNetns;

3
src/libnmc-setting/nm-meta-setting-desc.c
View file

@ -4433,6 +4433,7 @@ _get_fcn_ethtool(ARGS_GET_FCN)
RETURN_STR_TO_FREE(nm_strdup_int(u32));
case NM_ETHTOOL_TYPE_FEATURE:
case NM_ETHTOOL_TYPE_PAUSE:
case NM_ETHTOOL_TYPE_EEE:
if (!nm_setting_option_get_boolean(setting, nm_ethtool_data[ethtool_id]->optname, &b)) {
NM_SET_OUT(out_is_default, TRUE);
return NULL;
@ -4479,6 +4480,7 @@ _set_fcn_ethtool(ARGS_SET_FCN)
return TRUE;
case NM_ETHTOOL_TYPE_FEATURE:
case NM_ETHTOOL_TYPE_PAUSE:
case NM_ETHTOOL_TYPE_EEE:
if (!nmc_string_to_ternary_full(value,
NMC_STRING_TO_TERNARY_FLAGS_IGNORE_FOR_DEFAULT,
&t,
@ -5926,6 +5928,7 @@ static const NMMetaPropertyInfo *const property_infos_ETHTOOL[] = {
DEFINE_PROPERTY_TYP_DATA_SUBTYPE
(ethtool, .ethtool_id = NM_ETHTOOL_ID_PAUSE_TX)
),
PROPERTY_INFO_ETHTOOL (EEE_ENABLED),
PROPERTY_INFO_ETHTOOL (RING_RX),
PROPERTY_INFO_ETHTOOL (RING_RX_JUMBO),
PROPERTY_INFO_ETHTOOL (RING_RX_MINI),

2
src/nmcli/gen-metadata-nm-settings-nmcli.c
View file

@ -118,6 +118,7 @@ get_ethtool_format(const NMMetaPropertyInfo *prop_info)
return g_strdup("integer");
case NM_ETHTOOL_TYPE_FEATURE:
case NM_ETHTOOL_TYPE_PAUSE:
case NM_ETHTOOL_TYPE_EEE:
return g_strdup("ternary");
case NM_ETHTOOL_TYPE_UNKNOWN:
nm_assert_not_reached();
@ -317,6 +318,7 @@ append_ethtool_valid_values(const NMMetaPropertyInfo *prop_info, GPtrArray *vali
break;
case NM_ETHTOOL_TYPE_FEATURE:
case NM_ETHTOOL_TYPE_PAUSE:
case NM_ETHTOOL_TYPE_EEE:
append_vals(valid_values, "on", "off", "ignore");
break;
case NM_ETHTOOL_TYPE_UNKNOWN:

3
src/nmcli/gen-metadata-nm-settings-nmcli.xml.in
View file

@ -1028,6 +1028,9 @@
nmcli-description="Whether TX pause should be enabled. Only valid when automatic negotiation is disabled"
format="ternary"
values="on, off, ignore" />
<property name="eee"
format="ternary"
values="on, off, ignore" />
<property name="ring-rx"
format="integer"
values="0 - 4294967295" />