diff options
| author | Roy Marples <roy@marples.name> | 2013-02-15 20:36:33 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2013-02-15 20:36:33 +0000 |
| commit | ec19d7914fcdd1718dd38944abb3549e68444529 (patch) | |
| tree | a765c237625a4f49827698b5c2460ffee1522fdb | |
| parent | 09421f5aa94a143388d96002b5a99ae09b53eb05 (diff) | |
| download | dhcpcd-ec19d7914fcdd1718dd38944abb3549e68444529.tar.xz | |
Fix last commit a little.
| -rw-r--r-- | dhcpcd.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -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"); } |
