From: Roy Marples <roy@marples.name>
Date: Sun, 10 Feb 2008 23:40:24 +0000 (+0000)
Subject: Fix poll timeout.
X-Git-Tag: v3.2.3~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=568f95fa5d90c1e9b2267d4086809782a4e36559;p=thirdparty%2Fdhcpcd.git

Fix poll timeout.
---

diff --git a/client.c b/client.c
index a05d63cf..e4d1019e 100644
--- a/client.c
+++ b/client.c
@@ -522,13 +522,13 @@ static int wait_for_packet (struct pollfd *fds, state_t *state,
 	retval = 0;
 	while (state->timeout > 0 && retval == 0) {
 		if (iface->fd == -1)
-			timeout = INFTIM;
+			timeout = (int) state->timeout;
 		else {
 			timeout = TIMEOUT_MINI;
 			if (state->timeout < timeout)
 				timeout = (int) state->timeout;
-			timeout *= 1000;
 		}
+		timeout *= 1000;
 		state->start = uptime ();
 		retval = poll (fds, iface->fd == -1 ? 1 : 2, timeout);
 		state->timeout -= uptime () - state->start;