From 6f1437b79e4d3c695e2ce65e3c8bddfa8c2a66c6 Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Sun, 27 Apr 2025 22:30:16 -0400 Subject: [PATCH 1/3] libnm: add ethtool fec backported symbols from 1.50.4 Add to main branch ethtool fec symbols that were backported to 1.50.4 to allow seamless upgrading from 1.50 to 1.54. --- src/libnm-client-impl/libnm.ver | 5 +++++ src/libnm-client-impl/nm-client.c | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/src/libnm-client-impl/libnm.ver b/src/libnm-client-impl/libnm.ver index bfcf7f399e..c77dbecfeb 100644 --- a/src/libnm-client-impl/libnm.ver +++ b/src/libnm-client-impl/libnm.ver @@ -2009,6 +2009,11 @@ global: nm_setting_wireless_get_channel_width; } libnm_1_48_0; +libnm_1_50_4 { + #nm_ethtool_optname_is_fec@libnm_1_50_4; + #nm_setting_ethtool_fec_mode_get_type@libnm_1_50_4; +} libnm_1_50_0; + libnm_1_52_0 { global: nm_device_ipvlan_get_mode; diff --git a/src/libnm-client-impl/nm-client.c b/src/libnm-client-impl/nm-client.c index d2097b44fb..ee99d7e231 100644 --- a/src/libnm-client-impl/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -59,6 +59,7 @@ #include "nm-object-private.h" #include "nm-remote-connection.h" #include "nm-utils.h" +#include "nm-setting-ethtool.h" #include "nm-vpn-connection.h" /*****************************************************************************/ @@ -9314,3 +9315,11 @@ NM_BACKPORT_SYMBOL(libnm_1_30_8, (address)); NM_BACKPORT_SYMBOL(libnm_1_30_8, NMIPRoute *, nm_ip_route_dup, (NMIPRoute * route), (route)); + +NM_BACKPORT_SYMBOL(libnm_1_50_4, + gboolean, + nm_ethtool_optname_is_fec, + (const char *optname), + (optname)); + +NM_BACKPORT_SYMBOL(libnm_1_50_4, GType, nm_setting_ethtool_fec_mode_get_type, (void), ()); From 799a7a432a864e09bf740ee3bd2bd46718e11760 Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Mon, 28 Apr 2025 15:07:49 -0400 Subject: [PATCH 2/3] libnm: add ethtool fec backported symbols from 1.48.18 Add to main branch ethtool fec symbols that were backported to 1.48.18 to allow seamless upgrading from 1.48 to 1.54. --- src/libnm-client-impl/libnm.ver | 5 +++++ src/libnm-client-impl/nm-client.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/src/libnm-client-impl/libnm.ver b/src/libnm-client-impl/libnm.ver index c77dbecfeb..1e00494907 100644 --- a/src/libnm-client-impl/libnm.ver +++ b/src/libnm-client-impl/libnm.ver @@ -2003,6 +2003,11 @@ global: nm_setting_802_1x_get_openssl_ciphers; } libnm_1_46_0; +libnm_1_48_18 { + #nm_ethtool_optname_is_fec@libnm_1_48_18; + #nm_setting_ethtool_fec_mode_get_type@libnm_1_48_18; +} libnm_1_48_0; + libnm_1_50_0 { global: nm_setting_wireless_channel_width_get_type; diff --git a/src/libnm-client-impl/nm-client.c b/src/libnm-client-impl/nm-client.c index ee99d7e231..cc73d70f82 100644 --- a/src/libnm-client-impl/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -9316,6 +9316,14 @@ NM_BACKPORT_SYMBOL(libnm_1_30_8, NM_BACKPORT_SYMBOL(libnm_1_30_8, NMIPRoute *, nm_ip_route_dup, (NMIPRoute * route), (route)); +NM_BACKPORT_SYMBOL(libnm_1_48_18, + gboolean, + nm_ethtool_optname_is_fec, + (const char *optname), + (optname)); + +NM_BACKPORT_SYMBOL(libnm_1_48_18, GType, nm_setting_ethtool_fec_mode_get_type, (void), ()); + NM_BACKPORT_SYMBOL(libnm_1_50_4, gboolean, nm_ethtool_optname_is_fec, From 5b25bc4f9db4960a619a622107bb110b6c98b6a8 Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Mon, 28 Apr 2025 15:20:20 -0400 Subject: [PATCH 3/3] libnm: add ethtool fec backported symbols from 1.46.8 Add to main branch ethtool fec symbols that were backported to 1.46.8 to allow seamless upgrading from 1.46 to 1.54. --- src/libnm-client-impl/libnm.ver | 5 +++++ src/libnm-client-impl/nm-client.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/src/libnm-client-impl/libnm.ver b/src/libnm-client-impl/libnm.ver index 1e00494907..6a093a0658 100644 --- a/src/libnm-client-impl/libnm.ver +++ b/src/libnm-client-impl/libnm.ver @@ -1979,6 +1979,11 @@ global: nm_sriov_eswitch_mode_get_type; } libnm_1_44_0; +libnm_1_46_8 { + #nm_ethtool_optname_is_fec@libnm_1_46_8; + #nm_setting_ethtool_fec_mode_get_type@libnm_1_46_8; +} libnm_1_46_0; + libnm_1_48_0 { global: nm_setting_connection_down_on_poweroff_get_type; diff --git a/src/libnm-client-impl/nm-client.c b/src/libnm-client-impl/nm-client.c index cc73d70f82..99d0f95305 100644 --- a/src/libnm-client-impl/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -9316,6 +9316,14 @@ NM_BACKPORT_SYMBOL(libnm_1_30_8, NM_BACKPORT_SYMBOL(libnm_1_30_8, NMIPRoute *, nm_ip_route_dup, (NMIPRoute * route), (route)); +NM_BACKPORT_SYMBOL(libnm_1_46_8, + gboolean, + nm_ethtool_optname_is_fec, + (const char *optname), + (optname)); + +NM_BACKPORT_SYMBOL(libnm_1_46_8, GType, nm_setting_ethtool_fec_mode_get_type, (void), ()); + NM_BACKPORT_SYMBOL(libnm_1_48_18, gboolean, nm_ethtool_optname_is_fec,