mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-25 19:40:28 +01:00
merge: branch 'wl/nm-1-48-fec'
libnm: add ethtool fec backported symbols from 1.46.8 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2200
This commit is contained in:
commit
26b9017c68
2 changed files with 14 additions and 0 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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), ());
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue