From: Roy Marples Date: Wed, 10 Jun 2020 13:16:08 +0000 (+0100) Subject: minor cleanup X-Git-Tag: v9.1.2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cda00908bf197b3c6eba131c7da7058e9ce476ae;p=thirdparty%2Fdhcpcd.git minor cleanup --- diff --git a/src/ipv6nd.c b/src/ipv6nd.c index 504e647d..4e904292 100644 --- a/src/ipv6nd.c +++ b/src/ipv6nd.c @@ -1155,10 +1155,8 @@ ipv6nd_handlera(struct dhcpcd_ctx *ctx, if (ifp == rap->iface) break; } - if (rap != NULL && rap->willexpire) { - logerrx("settng def RA"); + if (rap != NULL && rap->willexpire) ipv6nd_applyra(ifp); - } #endif TAILQ_FOREACH(rap, ctx->ra_routers, next) { diff --git a/src/privsep-control.c b/src/privsep-control.c index f54ded09..ba8dff09 100644 --- a/src/privsep-control.c +++ b/src/privsep-control.c @@ -169,7 +169,6 @@ ps_ctl_dispatch(void *arg, struct ps_msghdr *psm, struct msghdr *msg) control_recvdata(fd, iov->iov_base, iov->iov_len); break; case PS_CTL_EOF: - fd = ctx->ps_control_client; control_free(ctx->ps_control_client); break; default: