colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: branch 'wl/ethtool_fec_backport_symbol'

Browse Source 
libnm: add ethtool fec backported symbols from 1.50.4

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2198
This commit is contained in:
Wen Liang
2025-05-06 13:35:39 +00:00
parent 64a4c2271a 5b25bc4f9d
commit 26d4bc9d32
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libnm-client-impl/libnm.ver
View File

@@ -1979,6 +1979,11 @@ global:
nm_sriov_eswitch_mode_get_type; nm_sriov_eswitch_mode_get_type;
} libnm_1_44_0; } 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 { libnm_1_48_0 {
global: global:
nm_setting_connection_down_on_poweroff_get_type; nm_setting_connection_down_on_poweroff_get_type;
@@ -2003,12 +2008,22 @@ global:
nm_setting_802_1x_get_openssl_ciphers; nm_setting_802_1x_get_openssl_ciphers;
} libnm_1_46_0; } 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 { libnm_1_50_0 {
global: global:
nm_setting_wireless_channel_width_get_type; nm_setting_wireless_channel_width_get_type;
nm_setting_wireless_get_channel_width; nm_setting_wireless_get_channel_width;
} libnm_1_48_0; } 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 { libnm_1_52_0 {
global: global:
nm_device_ipvlan_get_mode; nm_device_ipvlan_get_mode;

25
src/libnm-client-impl/nm-client.c
View File

@@ -59,6 +59,7 @@
#include "nm-object-private.h" #include "nm-object-private.h"
#include "nm-remote-connection.h" #include "nm-remote-connection.h"
#include "nm-utils.h" #include "nm-utils.h"
#include "nm-setting-ethtool.h"
#include "nm-vpn-connection.h" #include "nm-vpn-connection.h"
/*****************************************************************************/ /*****************************************************************************/
@@ -9314,3 +9315,27 @@ NM_BACKPORT_SYMBOL(libnm_1_30_8,
(address)); (address));
NM_BACKPORT_SYMBOL(libnm_1_30_8, NMIPRoute *, nm_ip_route_dup, (NMIPRoute * route), (route)); 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), ());
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), ());