Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- src/sys/netinet/udp_usrreq.c	2001/09/17 17:27:01	1.84
+++ src/sys/netinet/udp_usrreq.c	2001/10/15 09:51:15	1.85
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.84 2001/09/17 17:27:01 thorpej Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.85 2001/10/15 09:51:15 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -778,25 +778,21 @@ udp6_realinput(af, src, dst, m, off)
 				    !in6_mcmatch(in6p, &dst6, m->m_pkthdr.rcvif))
 					continue;
 			}
-#ifndef INET6_BINDV6ONLY
 			else {
 				if (IN6_IS_ADDR_V4MAPPED(&dst6) &&
-				    (in6p->in6p_flags & IN6P_BINDV6ONLY))
+				    (in6p->in6p_flags & IN6P_IPV6_V6ONLY))
 					continue;
 			}
-#endif
 			if (!IN6_IS_ADDR_UNSPECIFIED(&in6p->in6p_faddr)) {
 				if (!IN6_ARE_ADDR_EQUAL(&in6p->in6p_faddr,
 				    &src6) || in6p->in6p_fport != sport)
 					continue;
 			}
-#ifndef INET6_BINDV6ONLY
 			else {
 				if (IN6_IS_ADDR_V4MAPPED(&src6) &&
-				    (in6p->in6p_flags & IN6P_BINDV6ONLY))
+				    (in6p->in6p_flags & IN6P_IPV6_V6ONLY))
 					continue;
 			}
-#endif
 
 			last = in6p;
 			udp6_sendup(m, off, (struct sockaddr *)src,