From a54ac63bbf9b2c71026ac9028a8ffaf186cf3c82 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 28 Jun 2020 18:58:14 +0200 Subject: New upstream version 1.25.90 --- src/initrd/nmi-ibft-reader.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/initrd/nmi-ibft-reader.c') diff --git a/src/initrd/nmi-ibft-reader.c b/src/initrd/nmi-ibft-reader.c index 477bc0bf..fe6f6432 100644 --- a/src/initrd/nmi-ibft-reader.c +++ b/src/initrd/nmi-ibft-reader.c @@ -17,7 +17,6 @@ #include #include "nm-core-internal.h" -#include "platform/nm-platform.h" #include "NetworkManagerUtils.h" /*****************************************************************************/ @@ -185,12 +184,12 @@ ip_setting_add_from_block (GHashTable *nic, return FALSE; } - if ( (g_strcmp0 (s_origin, "3") == 0 && family == AF_INET) - || (g_strcmp0 (s_origin, "4") == 0 && family == AF_INET)) { + if ( (nm_streq0 (s_origin, "3") && family == AF_INET) + || (nm_streq0 (s_origin, "4") && family == AF_INET)) { method = NM_SETTING_IP4_CONFIG_METHOD_AUTO; - } else if (g_strcmp0 (s_origin, "3") == 0 && family == AF_INET6) { + } else if (nm_streq0 (s_origin, "3") && family == AF_INET6) { method = NM_SETTING_IP6_CONFIG_METHOD_DHCP; - } else if (g_strcmp0 (s_origin, "4") == 0 && family == AF_INET6) { + } else if (nm_streq0 (s_origin, "4") && family == AF_INET6) { method = NM_SETTING_IP6_CONFIG_METHOD_AUTO; } else if (family == AF_INET) { method = NM_SETTING_IP4_CONFIG_METHOD_MANUAL; -- cgit 1.3.0-6-gf8a5