From: Roy Marples <roy@marples.name>
Date: Tue, 13 Jun 2017 18:39:56 +0000 (+0100)
Subject: Guard MAX_RTR_SOLICITATION_DELAY if platform defined.
X-Git-Tag: v7.0.0-rc2~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=092fc40d6a594cfd077b4c3e20fd6e39f56eaf76;p=thirdparty%2Fdhcpcd.git

Guard MAX_RTR_SOLICITATION_DELAY if platform defined.
---

diff --git a/src/ipv6nd.h b/src/ipv6nd.h
index 4bf72697..17d6c953 100644
--- a/src/ipv6nd.h
+++ b/src/ipv6nd.h
@@ -63,10 +63,12 @@ struct rs_state {
 #define RS_STATE(a) ((struct rs_state *)(ifp)->if_data[IF_DATA_IPV6ND])
 #define RS_STATE_RUNNING(a) (ipv6nd_hasra((a)) && ipv6nd_dadcompleted((a)))
 
+#ifndef MAX_RTR_SOLICITATION_DELAY
 #define MAX_RTR_SOLICITATION_DELAY	1	/* seconds */
 #define MAX_UNICAST_SOLICIT		3	/* 3 transmissions */
 #define RTR_SOLICITATION_INTERVAL	4	/* seconds */
 #define MAX_RTR_SOLICITATIONS		3	/* times */
+#endif
 
 /* On carrier up, expire known routers after RTR_CARRIER_EXPIRE seconds. */
 #define RTR_CARRIER_EXPIRE		\