From: Roy Marples <roy@marples.name>
Date: Thu, 16 May 2013 10:54:20 +0000 (+0000)
Subject: Fix compile on Linux
X-Git-Tag: v5.99.7~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d914e23f5517869ea04a0ed2d657217dc4900ea3;p=thirdparty%2Fdhcpcd.git

Fix compile on Linux
---

diff --git a/if-linux.c b/if-linux.c
index 8df6b243..0d668e4d 100644
--- a/if-linux.c
+++ b/if-linux.c
@@ -378,7 +378,7 @@ link_addr(struct nlmsghdr *nlm)
 			}
 			rta = RTA_NEXT(rta, len);
 		}
-		ipv6_handleifa(nlm->nlmsg_type, ifn, &addr6);
+		ipv6_handleifa(nlm->nlmsg_type, ifn, &addr6, ifa->ifa_flags);
 		break;
 #endif
 	}
diff --git a/ipv6.c b/ipv6.c
index c026dfdd..134c92c7 100644
--- a/ipv6.c
+++ b/ipv6.c
@@ -35,7 +35,7 @@
 #  include <asm/types.h> /* for systems with broken headers */
 #  include <linux/rtnetlink.h>
    /* Match Linux defines to BSD */
-#  define IN6_IFF_TENTATIVE	IFA_F_TENTATIVE | IFA_F_OPTIMISTIC
+#  define IN6_IFF_TENTATIVE	(IFA_F_TENTATIVE | IFA_F_OPTIMISTIC)
 #  define IN6_IFF_DUPLICATED	IFA_F_DADFAILED
 #else
 #ifdef __FreeBSD__ /* Needed so that including netinet6/in6_var.h works */