From: Roy Marples <roy@marples.name>
Date: Fri, 18 Jul 2008 12:23:45 +0000 (+0000)
Subject: We could return from a few more states here.
X-Git-Tag: v4.0.2~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=833d43a51343862665655e561599c0e9eddae56c;p=thirdparty%2Fdhcpcd.git

We could return from a few more states here.
---

diff --git a/client.c b/client.c
index f216b396..0f0994f2 100644
--- a/client.c
+++ b/client.c
@@ -1731,7 +1731,9 @@ dhcp_run(const struct options *options, int *pid_fd)
 			} else if (fd_hasdata(iface->raw_fd) == 1) {
 				retval = handle_dhcp_packet(state, options);
 				if (retval == 0 &&
-				    state->state == STATE_REQUESTING)
+				    (state->state == STATE_REQUESTING ||
+				     state->state == STATE_INIT ||
+				     state->state == STATE_PROBING)
 					/* Fallthrough to handle_timeout */
 					continue;
 #ifdef ENABLE_ARP