From: Roy Marples <roy@marples.name>
Date: Wed, 26 May 2010 07:13:23 +0000 (+0000)
Subject: Clear timeouts on IPv4LL failure.
X-Git-Tag: v5.2.3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c06fa755a28a13de5829b33abeb915dc67b3095e;p=thirdparty%2Fdhcpcd.git

Clear timeouts on IPv4LL failure.
---

diff --git a/ipv4ll.c b/ipv4ll.c
index 3d365b36..43365404 100644
--- a/ipv4ll.c
+++ b/ipv4ll.c
@@ -144,6 +144,7 @@ handle_ipv4ll_failure(void *arg)
 	close_sockets(iface);
 	free(iface->state->offer);
 	iface->state->offer = NULL;
+	delete_timeout(NULL, iface);
 	if (++iface->state->conflicts > MAX_CONFLICTS) {
 		syslog(LOG_ERR, "%s: failed to acquire an IPv4LL address",
 		    iface->name);