From b3775325af4b88645316eaae8ba1a2fbd56e17dd Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 10 Jul 2020 17:39:53 +0200
Subject: [PATCH] libnm: add _nm_setting_bond_mode_from_string() to
 nm-libnm-core-intern

(cherry picked from commit a0b22b5b40bb795b348c2a7a4e571b6f7d8a5ae6)
---
 libnm-core/nm-core-internal.h                 | 15 -------------
 .../nm-libnm-core-utils.c                     | 21 +++++++++++++++++++
 .../nm-libnm-core-utils.h                     | 16 ++++++++++++++
 libnm-core/nm-setting-bond.c                  | 21 -------------------
 4 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 1d67b09408..3a15d2e956 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -567,21 +567,6 @@ NMConnectionMultiConnect _nm_connection_get_multi_connect (NMConnection *connect
 
 /*****************************************************************************/
 
-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);
 gboolean _nm_setting_bond_option_supported (const char *option, NMBondMode mode);
 
 /*****************************************************************************/
diff --git a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
index 66c4cafd89..f2c85cc60c 100644
--- a/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
+++ b/libnm-core/nm-libnm-core-intern/nm-libnm-core-utils.c
@@ -35,6 +35,27 @@ _nm_setting_bond_remove_options_arp_interval (NMSettingBond *s_bond)
 	nm_setting_bond_remove_option (s_bond, NM_SETTING_BOND_OPTION_ARP_IP_TARGET);
 }
 
+NM_UTILS_STRING_TABLE_LOOKUP_DEFINE (
+	_nm_setting_bond_mode_from_string,
+	NMBondMode,
+	{ g_return_val_if_fail (name, NM_BOND_MODE_UNKNOWN); },
+	{ return NM_BOND_MODE_UNKNOWN; },
+	{ "0",             NM_BOND_MODE_ROUNDROBIN   },
+	{ "1",             NM_BOND_MODE_ACTIVEBACKUP },
+	{ "2",             NM_BOND_MODE_XOR          },
+	{ "3",             NM_BOND_MODE_BROADCAST    },
+	{ "4",             NM_BOND_MODE_8023AD       },
+	{ "5",             NM_BOND_MODE_TLB          },
+	{ "6",             NM_BOND_MODE_ALB          },
+	{ "802.3ad",       NM_BOND_MODE_8023AD       },
+	{ "active-backup", NM_BOND_MODE_ACTIVEBACKUP },
+	{ "balance-alb",   NM_BOND_MODE_ALB          },
+	{ "balance-rr",    NM_BOND_MODE_ROUNDROBIN   },
+	{ "balance-tlb",   NM_BOND_MODE_TLB          },
+	{ "balance-xor",   NM_BOND_MODE_XOR          },
+	{ "broadcast",     NM_BOND_MODE_BROADCAST    },
+);
+
 /*****************************************************************************/
 
 gboolean
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 aeddf2f9c5..bb3fa5fcfa 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
@@ -52,6 +52,22 @@ const char **nm_utils_bond_option_arp_ip_targets_split (const char *arp_ip_targe
 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
diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c
index 3b6baf51da..6d83bfb824 100644
--- a/libnm-core/nm-setting-bond.c
+++ b/libnm-core/nm-setting-bond.c
@@ -736,27 +736,6 @@ _nm_setting_bond_get_option_type (NMSettingBond *setting, const char *name)
 	return option_meta->opt_type;
 }
 
-NM_UTILS_STRING_TABLE_LOOKUP_DEFINE (
-	_nm_setting_bond_mode_from_string,
-	NMBondMode,
-	{ g_return_val_if_fail (name, NM_BOND_MODE_UNKNOWN); },
-	{ return NM_BOND_MODE_UNKNOWN; },
-	{ "0",             NM_BOND_MODE_ROUNDROBIN   },
-	{ "1",             NM_BOND_MODE_ACTIVEBACKUP },
-	{ "2",             NM_BOND_MODE_XOR          },
-	{ "3",             NM_BOND_MODE_BROADCAST    },
-	{ "4",             NM_BOND_MODE_8023AD       },
-	{ "5",             NM_BOND_MODE_TLB          },
-	{ "6",             NM_BOND_MODE_ALB          },
-	{ "802.3ad",       NM_BOND_MODE_8023AD       },
-	{ "active-backup", NM_BOND_MODE_ACTIVEBACKUP },
-	{ "balance-alb",   NM_BOND_MODE_ALB          },
-	{ "balance-rr",    NM_BOND_MODE_ROUNDROBIN   },
-	{ "balance-tlb",   NM_BOND_MODE_TLB          },
-	{ "balance-xor",   NM_BOND_MODE_XOR          },
-	{ "broadcast",     NM_BOND_MODE_BROADCAST    },
-);
-
 /*****************************************************************************/
 
 static gboolean