fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 23:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: reject setting ethtool.pause-autoneg while setting pause-rx/pause-tx

Browse source 
Setting pause-rx/pause-tx to an explicit value, implies that the user
does not want to enable autoneg. Reject that as invalid value in the
connection profile.
This commit is contained in:
Thomas Haller 2021-05-14 12:52:41 +02:00
parent 0ce59b5dc4
commit dfc5667603
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@
#include "nm-setting-private.h"
#include "libnm-base/nm-ethtool-base.h"
#include "libnm-base/nm-ethtool-utils-base.h"
/*****************************************************************************/
@ -288,6 +289,9 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
GVariant *const * variants;
guint len;
guint i;
NMTernary pause_autoneg = NM_TERNARY_DEFAULT;
NMTernary pause_tx = NM_TERNARY_DEFAULT;
NMTernary pause_rx = NM_TERNARY_DEFAULT;
len = _nm_setting_option_get_all(setting, &optnames, &variants);
@ -329,6 +333,25 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
g_prefix_error(error, "%s.%s: ", NM_SETTING_ETHTOOL_SETTING_NAME, optname);
return FALSE;
}
} else if (NM_IN_SET(ethtool_id, NM_ETHTOOL_ID_PAUSE_AUTONEG))
pause_autoneg = g_variant_get_boolean(variant);
else if (NM_IN_SET(ethtool_id, NM_ETHTOOL_ID_PAUSE_RX))
pause_rx = g_variant_get_boolean(variant);
else if (NM_IN_SET(ethtool_id, NM_ETHTOOL_ID_PAUSE_TX))
pause_tx = g_variant_get_boolean(variant);
}
if (pause_rx != NM_TERNARY_DEFAULT || pause_tx != NM_TERNARY_DEFAULT) {
if (pause_autoneg == NM_TERNARY_TRUE) {
g_set_error_literal(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,
_("pause-autoneg cannot be enabled when setting rx/tx options"));
g_prefix_error(error,
"%s.%s: ",
NM_SETTING_ETHTOOL_SETTING_NAME,
NM_ETHTOOL_OPTNAME_PAUSE_AUTONEG);
return FALSE;
}
}