From d0e347ff5742c7d47f19bf76ec6c70ebfff29312 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Thu, 11 Sep 2014 13:29:56 +0000 Subject: [PATCH] Improve the waitip test. --- dhcpcd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dhcpcd.c b/dhcpcd.c index 8dbebd7a..ece6507a 100644 --- a/dhcpcd.c +++ b/dhcpcd.c @@ -234,9 +234,8 @@ dhcpcd_ipwaited(struct dhcpcd_ctx *ctx) !ipv6nd_addrexists(ctx, NULL) && !dhcp6_addrexists(ctx, NULL)) return 0; - if ((ctx->options & - (DHCPCD_WAITIP | DHCPCD_WAITIP4 | DHCPCD_WAITIP6)) == - (DHCPCD_WAITIP | DHCPCD_WAITIP4 | DHCPCD_WAITIP6) && + if (ctx->options & DHCPCD_WAITIP && + !(ctx->options & (DHCPCD_WAITIP4 | DHCPCD_WAITIP6)) && !ipv4_addrexists(ctx, NULL) && !ipv6nd_addrexists(ctx, NULL) && !dhcp6_addrexists(ctx, NULL)) -- 2.47.3