diff options
| author | Michael Biebl <biebl@debian.org> | 2020-06-28 18:59:08 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-06-28 18:59:08 +0200 |
| commit | 215112eefc83274273a10d9ddb5e107c9beec548 (patch) | |
| tree | a16052cef4bb8707d6a906dd784a50c75945d03e /src/initrd/nmi-ibft-reader.c | |
| parent | 5ed4e66e01b005212aee22c255c9c6b2a4b040a9 (diff) | |
| parent | a54ac63bbf9b2c71026ac9028a8ffaf186cf3c82 (diff) | |
Update upstream source from tag 'upstream/1.25.90'
Update to upstream version '1.25.90' with Debian dir 16d4caa71e8ba8c27ee163c88f11456b6cdc0490
Diffstat (limited to 'src/initrd/nmi-ibft-reader.c')
| -rw-r--r-- | src/initrd/nmi-ibft-reader.c | 9 |
1 files changed, 4 insertions, 5 deletions
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 <unistd.h> #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; |