From a7322eaa5d9bbb5d0ca31389651bfaef9a1237bf Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 11 Jun 2019 14:47:26 +0200
Subject: [PATCH] libnm: belatedly expose nm_ethtool_optname_is_feature() in
 libnm

Also, plan right away to backport this symbol all the way back to
1.14.8. As such, we only need to add it once, with the right linker
version "libnm_1_14_8".

But still, the symbols first appears on a major release 1.20.0.

(cherry picked from commit a4c14895072da61ad790551111e770e705897ba5)
---
 libnm-core/nm-setting-ethtool.c | 8 ++++++--
 libnm-core/nm-setting-ethtool.h | 2 +-
 libnm/libnm.ver                 | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/libnm-core/nm-setting-ethtool.c b/libnm-core/nm-setting-ethtool.c
index 827e3a6287..d34f901f29 100644
--- a/libnm-core/nm-setting-ethtool.c
+++ b/libnm-core/nm-setting-ethtool.c
@@ -40,13 +40,17 @@
 
 /**
  * nm_ethtool_optname_is_feature:
- * @optname: the option name to check
+ * @optname: (allow-none): the option name to check
  *
  * Checks whether @optname is a valid option name for an offload feature.
  *
  * %Returns: %TRUE, if @optname is valid
  *
- * Since: 1.14
+ * Since: 1.18.2
+ *
+ * Note that nm_ethtool_optname_is_feature() was first added to the libnm header files
+ * in 1.14.0 but forgot to actually add to the library. This happened belatedly in 1.20.0 and
+ * the stable versions 1.18.2, 1.16.4 and 1.14.8 (with linker version "libnm_1_14_8").
  */
 gboolean
 nm_ethtool_optname_is_feature (const char *optname)
diff --git a/libnm-core/nm-setting-ethtool.h b/libnm-core/nm-setting-ethtool.h
index 66a9448993..27880207fa 100644
--- a/libnm-core/nm-setting-ethtool.h
+++ b/libnm-core/nm-setting-ethtool.h
@@ -84,7 +84,7 @@ G_BEGIN_DECLS
 #define NM_ETHTOOL_OPTNAME_FEATURE_TX_UDP_TNL_SEGMENTATION      "feature-tx-udp_tnl-segmentation"
 #define NM_ETHTOOL_OPTNAME_FEATURE_TX_VLAN_STAG_HW_INSERT       "feature-tx-vlan-stag-hw-insert"
 
-NM_AVAILABLE_IN_1_14
+NM_AVAILABLE_IN_1_18_2
 gboolean nm_ethtool_optname_is_feature (const char *optname);
 
 /*****************************************************************************/
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 8100f3b631..36183b241c 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1445,6 +1445,10 @@ global:
 	nm_utils_sriov_vf_to_str;
 } libnm_1_12_0;
 
+libnm_1_14_8 {
+	nm_ethtool_optname_is_feature;
+} libnm_1_14_0;
+
 libnm_1_16_0 {
 global:
 	nm_client_add_and_activate_connection2;