From ddc41d427af9285573a2a4b8da136f3abf95c09f Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 15 Mar 2021 20:31:54 +0100
Subject: [PATCH] libnm: add internal _nm_setting_wired_is_valid_s390_option()
 helper

---
 src/libnm-core-impl/nm-setting-wired.c   | 6 +++---
 src/libnm-core-intern/nm-core-internal.h | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libnm-core-impl/nm-setting-wired.c b/src/libnm-core-impl/nm-setting-wired.c
index f86bd95102..af6e2eec0d 100644
--- a/src/libnm-core-impl/nm-setting-wired.c
+++ b/src/libnm-core-impl/nm-setting-wired.c
@@ -108,8 +108,8 @@ static const char *const valid_s390_opts[] = {
     NULL,
 };
 
-static gboolean
-valid_s390_opts_check(const char *option)
+gboolean
+_nm_setting_wired_is_valid_s390_option(const char *option)
 {
     if (NM_MORE_ASSERT_ONCE(10)) {
         gsize i;
@@ -804,7 +804,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
 
         nm_assert(v->name);
 
-        if (!valid_s390_opts_check(v->name)) {
+        if (!_nm_setting_wired_is_valid_s390_option(v->name)) {
             g_set_error(error,
                         NM_CONNECTION_ERROR,
                         NM_CONNECTION_ERROR_INVALID_PROPERTY,
diff --git a/src/libnm-core-intern/nm-core-internal.h b/src/libnm-core-intern/nm-core-internal.h
index 8b3ae0c097..4b9d12a70f 100644
--- a/src/libnm-core-intern/nm-core-internal.h
+++ b/src/libnm-core-intern/nm-core-internal.h
@@ -309,7 +309,8 @@ typedef gpointer (*NMUtilsCopyFunc)(gpointer);
 const char **
 _nm_ip_address_get_attribute_names(const NMIPAddress *addr, gboolean sorted, guint *out_length);
 
-void _nm_setting_wired_clear_s390_options(NMSettingWired *setting);
+void     _nm_setting_wired_clear_s390_options(NMSettingWired *setting);
+gboolean _nm_setting_wired_is_valid_s390_option(const char *option);
 
 gboolean _nm_ip_route_attribute_validate_all(const NMIPRoute *route, GError **error);
 const char **