diff options
| author | Michael Biebl <biebl@debian.org> | 2022-08-16 18:25:29 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-08-16 18:25:29 +0200 |
| commit | e8c0c4050b07c08cc0f34d41cdff98f2cdc1cc93 (patch) | |
| tree | 79a3d9572e508d4b193ea175c8ed103b2024f727 /src/libnm-core-intern | |
| parent | 49ac65f875a36d7ebcbc8270cf0fc60acbb2e052 (diff) | |
| parent | 0018d1f3cf71d680d7b6bceda55a5717244d8b26 (diff) | |
Update upstream source from tag 'upstream/1.39.90'
Update to upstream version '1.39.90' with Debian dir 898f1bfdb7bf17595463e4195c78d8455df545e6
Diffstat (limited to 'src/libnm-core-intern')
| -rw-r--r-- | src/libnm-core-intern/nm-core-internal.h | 6 | ||||
| -rw-r--r-- | src/libnm-core-intern/nm-keyfile-utils.h | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h index 032f6a9a..ee4cc25b 100644 --- a/src/libnm-core-intern/nm-core-internal.h +++ b/src/libnm-core-intern/nm-core-internal.h @@ -491,8 +491,6 @@ typedef enum { NMBondOptionType _nm_setting_bond_get_option_type(NMSettingBond *setting, const char *name); -const char *nm_setting_bond_get_option_or_default(NMSettingBond *self, const char *option); - #define NM_BOND_AD_ACTOR_SYSTEM_DEFAULT "00:00:00:00:00:00" /*****************************************************************************/ @@ -519,6 +517,10 @@ NMConnectionMultiConnect _nm_connection_get_multi_connect(NMConnection *connecti gboolean _nm_setting_bond_option_supported(const char *option, NMBondMode mode); +guint32 _nm_setting_bond_opt_value_as_u32(NMSettingBond *s_bond, const char *opt); +guint16 _nm_setting_bond_opt_value_as_u16(NMSettingBond *s_bond, const char *opt); +guint8 _nm_setting_bond_opt_value_as_u8(NMSettingBond *s_bond, const char *opt); + /*****************************************************************************/ GPtrArray *_nm_setting_bridge_get_vlans(NMSettingBridge *setting); diff --git a/src/libnm-core-intern/nm-keyfile-utils.h b/src/libnm-core-intern/nm-keyfile-utils.h index f79f020f..08f169ac 100644 --- a/src/libnm-core-intern/nm-keyfile-utils.h +++ b/src/libnm-core-intern/nm-keyfile-utils.h @@ -12,10 +12,6 @@ /*****************************************************************************/ -#include "libnm-glib-aux/nm-shared-utils.h" - -/*****************************************************************************/ - #define NM_KEYFILE_GROUP_VPN_SECRETS "vpn-secrets" #define NM_KEYFILE_GROUPPREFIX_WIREGUARD_PEER "wireguard-peer." |