Merge branch 'debian/master' into ubuntu/master

1 files changed, 4 insertions, 2 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);