fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-27 01:10:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'wl/nm-1-50-fec'

Browse source 
libnm: add ethtool fec backported symbols from 1.48.18 and 1.46.8

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2199
This commit is contained in:
Wen Liang 2025-05-06 13:37:42 +00:00
commit 99eef96339
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libnm-client-impl/libnm.ver
View file

@ -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;
@ -2003,6 +2008,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;

18
src/libnm-client-impl/nm-client.c
View file

@ -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,20 @@ 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), ());
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), ());