From: Roy Marples <roy@marples.name>
Date: Tue, 4 Mar 2014 17:13:40 +0000 (+0000)
Subject: No need for this code when we can reliably work with IPv6 RTM_DELADDR messages
X-Git-Tag: v6.3.2~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dad4eeb21a2966da9115c553c1b83a615a73f05b;p=thirdparty%2Fdhcpcd.git

No need for this code when we can reliably work with IPv6 RTM_DELADDR messages
---

diff --git a/ipv6.c b/ipv6.c
index 284c57a0..51c8d66b 100644
--- a/ipv6.c
+++ b/ipv6.c
@@ -488,8 +488,10 @@ ipv6_freedrop_addrs(struct ipv6_addrhead *addrs, int drop,
     const struct interface *ifd)
 {
 	struct ipv6_addr *ap, *apn;
+#ifdef LISTEN_DAD
 	struct ipv6_state *state;
 	struct ipv6_addr_l *lap;
+#endif
 
 	TAILQ_FOREACH_SAFE(ap, addrs, next, apn) {
 		if (ifd && ap->delegating_iface != ifd)
@@ -512,7 +514,9 @@ ipv6_freedrop_addrs(struct ipv6_addrhead *addrs, int drop,
 			    errno != EADDRNOTAVAIL && errno != ENXIO)
 				syslog(LOG_ERR, "del_address6 %m");
 
-			/* Remove it from our internal state */
+#ifdef LISTEN_DAD
+			/* Remove it from our internal state as we cannot
+			 * reliably listen to RTM messages */
 			state = IPV6_STATE(ap->iface);
 			if (state) {
 				TAILQ_FOREACH(lap, &state->addrs, next) {
@@ -526,6 +530,7 @@ ipv6_freedrop_addrs(struct ipv6_addrhead *addrs, int drop,
 					}
 				}
 			}
+#endif
 		}
 		free(ap);
 	}