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/netinet6/nd6_nbr.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/nd6_nbr.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.22
retrieving revision 1.22.4.2
diff -u -p -r1.22 -r1.22.4.2
--- src/sys/netinet6/nd6_nbr.c	2000/05/19 01:40:19	1.22
+++ src/sys/netinet6/nd6_nbr.c	2001/05/09 19:42:58	1.22.4.2
@@ -1,5 +1,5 @@
-/*	$NetBSD: nd6_nbr.c,v 1.22 2000/05/19 01:40:19 itojun Exp $	*/
-/*	$KAME: nd6_nbr.c,v 1.36 2000/05/17 12:35:59 jinmei Exp $	*/
+/*	$NetBSD: nd6_nbr.c,v 1.22.4.2 2001/05/09 19:42:58 he Exp $	*/
+/*	$KAME: nd6_nbr.c,v 1.51 2001/01/20 17:27:00 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -105,8 +105,8 @@ nd6_ns_input(m, off, icmp6len)
 	struct sockaddr_dl *proxydl = NULL;
 
 	if (ip6->ip6_hlim != 255) {
-		log(LOG_ERR,
-		    "nd6_ns_input: invalid hlim %d\n", ip6->ip6_hlim);
+		nd6log((LOG_ERR,
+		    "nd6_ns_input: invalid hlim %d\n", ip6->ip6_hlim));
 		goto freeit;
 	}
 
@@ -119,8 +119,8 @@ nd6_ns_input(m, off, icmp6len)
 		    && daddr6.s6_addr8[12] == 0xff) {
 			; /*good*/
 		} else {
-			log(LOG_INFO, "nd6_ns_input: bad DAD packet "
-				"(wrong ip6 dst)\n");
+			nd6log((LOG_INFO, "nd6_ns_input: bad DAD packet "
+				"(wrong ip6 dst)\n"));
 			goto bad;
 		}
 	}
@@ -493,7 +493,7 @@ nd6_ns_output(ifp, daddr6, taddr6, ln, d
 
 #ifdef IPSEC
 	/* Don't lookup socket */
-	ipsec_setsocket(m, NULL);
+	(void)ipsec_setsocket(m, NULL);
 #endif
 	ip6_output(m, NULL, NULL, dad ? IPV6_DADOUTPUT : 0, &im6o, &outif);
 	if (outif) {
@@ -539,8 +539,8 @@ nd6_na_input(m, off, icmp6len)
 	union nd_opts ndopts;
 
 	if (ip6->ip6_hlim != 255) {
-		log(LOG_ERR,
-		    "nd6_na_input: invalid hlim %d\n", ip6->ip6_hlim);
+		nd6log((LOG_ERR,
+		    "nd6_na_input: invalid hlim %d\n", ip6->ip6_hlim));
 		goto freeit;
 	}
 
@@ -913,7 +913,7 @@ nd6_na_output(ifp, daddr6, taddr6, flags
 
 #ifdef IPSEC
 	/* Don't lookup socket */
-	ipsec_setsocket(m, NULL);
+	(void)ipsec_setsocket(m, NULL);
 #endif
 	ip6_output(m, NULL, NULL, 0, &im6o, &outif);
 	if (outif) {