From 56af31289bcb52fb92c3b5d4bf1bd847dc460159 Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Tue, 29 Apr 2025 18:13:32 -0400 Subject: [PATCH] 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.48. --- 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 1c2189faef..1710e7a8c4 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 677f9aacab..412ceaab1b 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_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), ());