From 136d191f1c96dbae1489fed7c2565f5e1b1f8d40 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 13 Jul 2020 22:03:16 +0200 Subject: New upstream version 1.26.0 --- .../nm-libnm-core-intern/nm-libnm-core-utils.h | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h') diff --git a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h index afc214d4..bb3fa5fc 100644 --- a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h +++ b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.h @@ -5,6 +5,7 @@ /****************************************************************************/ +#include "nm-setting-bond.h" #include "nm-setting-bridge.h" #include "nm-setting-connection.h" #include "nm-setting-ip-config.h" @@ -46,6 +47,29 @@ NM_AUTO_DEFINE_FCN0 (NMWireGuardPeer *, _nm_auto_unref_wgpeer, nm_wireguard_peer /****************************************************************************/ +const char **nm_utils_bond_option_arp_ip_targets_split (const char *arp_ip_target); + +void _nm_setting_bond_remove_options_miimon (NMSettingBond *s_bond); +void _nm_setting_bond_remove_options_arp_interval (NMSettingBond *s_bond); + +typedef enum { + NM_BOND_MODE_UNKNOWN = -1, + + /* The numeric values correspond to kernel's numbering of the modes. */ + NM_BOND_MODE_ROUNDROBIN = 0, + NM_BOND_MODE_ACTIVEBACKUP = 1, + NM_BOND_MODE_XOR = 2, + NM_BOND_MODE_BROADCAST = 3, + NM_BOND_MODE_8023AD = 4, + NM_BOND_MODE_TLB = 5, + NM_BOND_MODE_ALB = 6, + _NM_BOND_MODE_NUM, +} NMBondMode; + +NMBondMode _nm_setting_bond_mode_from_string (const char *str); + +/*****************************************************************************/ + static inline guint32 nm_utils_vlan_priority_map_get_max_prio (NMVlanPriorityMap map, gboolean from) { -- cgit 1.3.0-6-gf8a5