diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-11-14 14:40:24 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-11-15 09:36:29 +0100 |
| commit | 36629ae710eaf6880a552cfa8d696d18d36f144e (patch) | |
| tree | c4d55be2f899a5dde25af1ee7bf8234de4c9e460 | |
| parent | b853a3021c271fbd8a17bcd4dbcd15da3813fe7d (diff) | |
libnm: rename "ethtool.eee" property to "ethtool.eee-enabled"
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: 3165d9a2deea ('ethtool: introduce EEE support')
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1792
4 files changed, 6 insertions, 4 deletions
diff --git a/src/libnm-base/nm-ethtool-utils-base.h b/src/libnm-base/nm-ethtool-utils-base.h index 6b7a5937bc..75fb63c571 100644 --- a/src/libnm-base/nm-ethtool-utils-base.h +++ b/src/libnm-base/nm-ethtool-utils-base.h @@ -109,7 +109,8 @@ 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" +#define NM_ETHTOOL_OPTNAME_EEE_ENABLED "eee-enabled" + /*****************************************************************************/ G_END_DECLS diff --git a/src/libnm-client-public/nm-ethtool-utils.h b/src/libnm-client-public/nm-ethtool-utils.h index 6b7a5937bc..75fb63c571 100644 --- a/src/libnm-client-public/nm-ethtool-utils.h +++ b/src/libnm-client-public/nm-ethtool-utils.h @@ -109,7 +109,8 @@ 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" +#define NM_ETHTOOL_OPTNAME_EEE_ENABLED "eee-enabled" + /*****************************************************************************/ G_END_DECLS diff --git a/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in b/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in index 78394a0432..3c409b60bd 100644 --- a/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in +++ b/src/libnm-core-impl/gen-metadata-nm-settings-libnm-core.xml.in @@ -1276,7 +1276,7 @@ dbus-type="b" is-setting-option="1" /> - <property name="eee" + <property name="eee-enabled" dbus-type="b" is-setting-option="1" /> diff --git a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in index 47b686829c..ed06e92968 100644 --- a/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in +++ b/src/nmcli/gen-metadata-nm-settings-nmcli.xml.in @@ -1028,7 +1028,7 @@ nmcli-description="Whether TX pause should be enabled. Only valid when automatic negotiation is disabled" format="ternary" values="on, off, ignore" /> - <property name="eee" + <property name="eee-enabled" format="ternary" values="on, off, ignore" /> <property name="ring-rx" |