From 4ecbe3316a4934603dabda9a97e3c1559793245e Mon Sep 17 00:00:00 2001
From: SUZUKI Shinsuke <suz@FreeBSD.org>
Date: Fri, 21 Oct 2005 15:45:13 +0000
Subject: [PATCH] sync with KAME (renamed a macro IPV6_DADOUTPUT to
 IPV6_UNSPECSRC)

Obtained from: KAME
---
 sys/netinet6/ip6_output.c | 2 +-
 sys/netinet6/ip6_var.h    | 2 +-
 sys/netinet6/nd6_nbr.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 5bdef30eec4..193f877b3a5 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -525,7 +525,7 @@ skip_ipsec2:;
 
 	/* Source address validation */
 	if (IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_src) &&
-	    (flags & IPV6_DADOUTPUT) == 0) {
+	    (flags & IPV6_UNSPECSRC) == 0) {
 		error = EOPNOTSUPP;
 		ip6stat.ip6s_badscope++;
 		goto bad;
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index f88f125f6cb..a0dfec386fa 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -276,7 +276,7 @@ struct ip6aux {
 
 #ifdef _KERNEL
 /* flags passed to ip6_output as last parameter */
-#define	IPV6_DADOUTPUT		0x01	/* DAD */
+#define	IPV6_UNSPECSRC		0x01	/* allow :: as the source address */
 #define	IPV6_FORWARDING		0x02	/* most of IPv6 header exists */
 #define	IPV6_MINMTU		0x04	/* use minimum MTU (IPV6_USE_MIN_MTU) */
 
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index dc1de4e9baa..f596c6465e9 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -514,7 +514,7 @@ nd6_ns_output(ifp, daddr6, taddr6, ln, dad)
 	nd_ns->nd_ns_cksum =
 	    in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), icmp6len);
 
-	ip6_output(m, NULL, &ro, dad ? IPV6_DADOUTPUT : 0, &im6o, NULL, NULL);
+	ip6_output(m, NULL, &ro, dad ? IPV6_UNSPECSRC : 0, &im6o, NULL, NULL);
 	icmp6_ifstat_inc(ifp, ifs6_out_msg);
 	icmp6_ifstat_inc(ifp, ifs6_out_neighborsolicit);
 	icmp6stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT]++;