From: Roy Marples <roy@marples.name>
Date: Tue, 20 Feb 2018 08:25:59 +0000 (+0000)
Subject: if-linux: if_setup_inet6 is called once so remove local ifname
X-Git-Tag: v7.0.2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a4e2fcfc4c5d4fa38af99ead457cc1a7aab1697;p=thirdparty%2Fdhcpcd.git

if-linux: if_setup_inet6 is called once so remove local ifname
---

diff --git a/src/if-linux.c b/src/if-linux.c
index e802366a..dfd3ffbe 100644
--- a/src/if-linux.c
+++ b/src/if-linux.c
@@ -1683,7 +1683,6 @@ static const char *prefix = "/proc/sys/net/ipv6/conf";
 void
 if_setup_inet6(const struct interface *ifp)
 {
-	const char *ifname;
 	int ra;
 	char path[256];
 
@@ -1702,14 +1701,14 @@ if_setup_inet6(const struct interface *ifp)
 	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;