From: Roy Marples <roy@marples.name>
Date: Fri, 15 Feb 2013 20:36:33 +0000 (+0000)
Subject: Fix last commit a little.
X-Git-Tag: v5.6.8~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec19d7914fcdd1718dd38944abb3549e68444529;p=thirdparty%2Fdhcpcd.git

Fix last commit a little.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 669eb959..6aa93b88 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1293,18 +1293,19 @@ init_state(struct interface *iface, int argc, char **argv)
 	configure_interface(iface, argc, argv);
 	ifo = ifs->options;
 
-	if (if_options->options & DHCPCD_LINK && linkfd == -1) {
+	if (ifo->options & DHCPCD_LINK && linkfd == -1) {
 		linkfd = open_link_socket();
-		if (linkfd == -1)
+		if (linkfd == -1) {
 			syslog(LOG_ERR, "open_link_socket: %m");
-		else
+			ifo->options &= ~DHCPCD_LINK;
+		} else
 			add_event(linkfd, handle_link, NULL);
 	}
 
 	if (ifo->options & DHCPCD_IPV6RS && !check_ipv6(NULL))
-		options &= ~DHCPCD_IPV6RS;
+		ifo->options &= ~DHCPCD_IPV6RS;
 	if (ifo->options & DHCPCD_IPV6RS && ipv6_open() == -1) {
-		options &= ~DHCPCD_IPV6RS;
+		ifo->options &= ~DHCPCD_IPV6RS;
 		syslog(LOG_ERR, "ipv6_open: %m");
 	}