fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 19:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: rename "ethtool.eee" property to "ethtool.eee-enabled"

Browse source 
There are various properties related to EEE, that we might want to add
support for in the future (for example, "ethtool.eee-advertise").

Don't use up the base name "eee", instead make it "eee-enabled". All
properties should have different prefixes, and "ethtool.eee" would be a
prefix of "ethtool.eee-advertise".

Also, the #define is already called NM_ETHTOOL_OPTNAME_EEE_ENABLED. This
also should be consistent.

Rename.

Fixes: 3165d9a2de ('ethtool: introduce EEE support')

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1792
This commit is contained in:
Thomas Haller 2023-11-14 14:40:24 +01:00
parent b853a3021c
commit 36629ae710
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -1276,7 +1276,7 @@
dbus-type="b" dbus-type="b"
is-setting-option="1" is-setting-option="1"
/> />
<property name="eee" <property name="eee-enabled"
dbus-type="b" dbus-type="b"
is-setting-option="1" is-setting-option="1"
/> />

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

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