From: Roy Marples <roy@marples.name>
Date: Thu, 14 May 2015 09:20:26 +0000 (+0000)
Subject: Fix waiting on non interface ip, [2095791c47].
X-Git-Tag: v6.9.0~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3eec3bb5a1ff3bad2fdbc60234f6d740f73fe1e;p=thirdparty%2Fdhcpcd.git

Fix waiting on non interface ip, [2095791c47].
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 5f21a920..27c5ac91 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -234,8 +234,8 @@ dhcpcd_ipwaited(struct dhcpcd_ctx *ctx)
 	struct interface *ifp;
 
 	TAILQ_FOREACH(ifp, ctx->ifaces, next) {
-		if (!dhcpcd_ifipwaited(ifp, ifp->options->options)) {
-			if (ifp->options->options & DHCPCD_WAITOPTS) {
+		if (ifp->options->options & DHCPCD_WAITOPTS) {
+			if (!dhcpcd_ifipwaited(ifp, ifp->options->options)) {
 				logger(ctx, LOG_DEBUG,
 				    "%s: waiting for an ip address",
 				    ifp->name);
@@ -248,7 +248,7 @@ dhcpcd_ipwaited(struct dhcpcd_ctx *ctx)
 		return 1;
 
 	TAILQ_FOREACH(ifp, ctx->ifaces, next) {
-		if (dhcpcd_ifipwaited(ifp, ifp->options->options))
+		if (dhcpcd_ifipwaited(ifp, ctx->options))
 			return 1;
 	}