diff options
| author | Roy Marples <roy@marples.name> | 2013-08-20 10:29:43 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2013-08-20 10:29:43 +0000 |
| commit | e82129a42c5525d0d16d591cca537dacf169141d (patch) | |
| tree | 1cfc5005a13ddb47f007cc366b169a3d25f90e42 /ipv6.c | |
| parent | 91f99a7e6f245353de50f9db4373744aa3e0864b (diff) | |
| download | dhcpcd-e82129a42c5525d0d16d591cca537dacf169141d.tar.xz | |
Reduce code size by merging IPv6 ND with RS.
Diffstat (limited to 'ipv6.c')
| -rw-r--r-- | ipv6.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -59,7 +59,7 @@ #include "dhcp6.h" #include "eloop.h" #include "ipv6.h" -#include "ipv6rs.h" +#include "ipv6nd.h" /* Hackery at it's finest. */ #ifndef s6_addr32 @@ -457,7 +457,7 @@ ipv6_freedrop_addrs(struct ipv6_addrhead *addrs, int drop, * This is safe because the RA is removed from the list * before we are called. */ if (drop && ap->flags & IPV6_AF_ADDED && - !ipv6rs_addrexists(ap) && !dhcp6_addrexists(ap)) + !ipv6nd_addrexists(ap) && !dhcp6_addrexists(ap)) { syslog(LOG_INFO, "%s: deleting address %s", ap->iface->name, ap->saddr); @@ -535,7 +535,7 @@ ipv6_handleifa(int cmd, struct if_head *ifs, const char *ifname, return; if (!IN6_IS_ADDR_LINKLOCAL(addr)) { - ipv6rs_handleifa(cmd, ifname, addr, flags); + ipv6nd_handleifa(cmd, ifname, addr, flags); dhcp6_handleifa(cmd, ifname, addr, flags); } |