From: Roy Marples <roy@marples.name>
Date: Tue, 15 Jul 2008 00:53:30 +0000 (+0000)
Subject: Fix timeout.
X-Git-Tag: v4.0.2~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cf7ba77c12b6b10155586da247d416527b66bc1;p=thirdparty%2Fdhcpcd.git

Fix timeout.
---

diff --git a/client.c b/client.c
index a5be48e3..e4a12176 100644
--- a/client.c
+++ b/client.c
@@ -737,12 +737,13 @@ wait_for_packet(struct if_state *state)
 wait_again:
 	get_time(&now);
 	if (timeout != INFTIM) {
+		if (!timerisset(&state->timeout))
+			return 0;
 		ref = NULL;
 		if (timerisset(&state->stop) &&
 		    timercmp(&state->stop, &now, >))
 			ref = &state->stop;
-		if (timerisset(&state->timeout) &&
-		    timercmp(&state->timeout, &now, >) &&
+		if (timercmp(&state->timeout, &now, >) &&
 		    (!ref || timercmp(&state->timeout, ref, <)))
 			ref = &state->timeout;
 		if (!ref)