From: Roy Marples <roy@marples.name>
Date: Sun, 18 Jan 2015 20:46:43 +0000 (+0000)
Subject: Now that ipv6 has it's own eloop, ensure that we clear any interface
X-Git-Tag: v6.7.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70193d0a9a178e0e7d2ad8d586b4d63277b09785;p=thirdparty%2Fdhcpcd.git

Now that ipv6 has it's own eloop, ensure that we clear any interface
timeout when freeing the IPv6 state.
---

diff --git a/ipv6.c b/ipv6.c
index 33650f15..c4a06f7f 100644
--- a/ipv6.c
+++ b/ipv6.c
@@ -1259,6 +1259,7 @@ ipv6_free(struct interface *ifp)
 			}
 			free(state);
 			ifp->if_data[IF_DATA_IPV6] = NULL;
+			eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
 		}
 	}
 }
@@ -1379,9 +1380,6 @@ ipv6_gentempifid(struct interface *ifp)
 	int retry;
 
 	state = IPV6_STATE(ifp);
-	if (state == NULL)
-		return;
-
 	retry = 0;
 	if (memcmp(nullid, state->randomseed0, sizeof(nullid)) == 0) {
 		uint32_t r;