summaryrefslogtreecommitdiffstats
path: root/ipv6nd.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2014-05-03 21:18:20 +0000
committerRoy Marples <roy@marples.name>2014-05-03 21:18:20 +0000
commitd936ec19fc4ab3ad3c1da102d741ca011cf80908 (patch)
tree2161b23567485a078cbb82237e07f18c518c86c7 /ipv6nd.c
parentd56187a6dc0731bba02056095efc7db1b440a45f (diff)
downloaddhcpcd-d936ec19fc4ab3ad3c1da102d741ca011cf80908.tar.xz
Fix compile.
Diffstat (limited to 'ipv6nd.c')
-rw-r--r--ipv6nd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ipv6nd.c b/ipv6nd.c
index fade521a..d4e52250 100644
--- a/ipv6nd.c
+++ b/ipv6nd.c
@@ -1494,12 +1494,11 @@ ipv6nd_handledata(void *arg)
icp->icmp6_type, icp->icmp6_code, ctx->sfrom);
}
-static int
+static void
ipv6nd_startrs1(void *arg)
{
struct interface *ifp = arg;
struct rs_state *state;
- struct timeval tv;
syslog(LOG_INFO, "%s: soliciting an IPv6 router", ifp->name);
if (ipv6nd_open(ifp->ctx) == -1) {
@@ -1507,8 +1506,6 @@ ipv6nd_startrs1(void *arg)
return;
}
- eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
-
state = RS_STATE(ifp);
if (state == NULL) {
ifp->if_data[IF_DATA_IPV6ND] = calloc(1, sizeof(*state));
@@ -1536,6 +1533,7 @@ ipv6nd_startrs(struct interface *ifp)
{
struct timeval tv;
+ eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
tv.tv_sec = 0;
tv.tv_usec = (suseconds_t)(arc4random() %
(MAX_RTR_SOLICITATION_DELAY * 1000000));