From af89769701cdd8c872caa354b41e21c182381617 Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Tue, 29 Apr 2025 17:58:03 -0400 Subject: [PATCH 1/2] 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.50. --- 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 a50c65a4a3..8fa401917f 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 6e722c5c09..9b579428b7 100644 --- a/src/libnm-client-impl/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -58,6 +58,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" /*****************************************************************************/ @@ -9313,3 +9314,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_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), ()); From ed7a61254b9d64aec10dcc49a1bd1f6b93ce01f3 Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Tue, 29 Apr 2025 18:00:45 -0400 Subject: [PATCH 2/2] 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.50. --- 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 8fa401917f..bd3e8ed6fb 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 9b579428b7..a8c9d4260f 100644 --- a/src/libnm-client-impl/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -9315,6 +9315,15 @@ 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,