Mercurial > hg > dhcpcd

changeset 4225:8dd3a40d7df2 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
if-linux: if_setup_inet6 is called once so remove local ifname
author Roy Marples <roy@marples.name>
date Tue, 20 Feb 2018 08:25:59 +0000
parents 595761ecbde0
children fdca1e4dfd1e
files src/if-linux.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/if-linux.c	Tue Feb 13 10:33:06 2018 +0000
+++ b/src/if-linux.c	Tue Feb 20 08:25:59 2018 +0000
@@ -1683,7 +1683,6 @@
 void
 if_setup_inet6(const struct interface *ifp)
 {
-	const char *ifname;
 	int ra;
 	char path[256];
 
@@ -1702,14 +1701,14 @@
 	if (!(ifp->options->options & DHCPCD_IPV6RS))
 		return;
 
-	snprintf(path, sizeof(path), "%s/%s/autoconf", prefix, ifname);
+	snprintf(path, sizeof(path), "%s/%s/autoconf", prefix, ifp->name);
 	ra = check_proc_int(path);
 	if (ra != 1 && ra != -1) {
 		if (write_path(path, "0") == -1)
 			logerr("%s: %s", __func__, path);
 	}
 
-	snprintf(path, sizeof(path), "%s/%s/accept_ra", prefix, ifname);
+	snprintf(path, sizeof(path), "%s/%s/accept_ra", prefix, ifp->name);
 	ra = check_proc_int(path);
 	if (ra == -1) {
 		logfunc_t *logfunc = errno == ENOENT? logdebug : logwarn;