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/ip6_input.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_input.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.122.2.1
retrieving revision 1.122.2.2
diff -u -p -r1.122.2.1 -r1.122.2.2
--- src/sys/netinet6/ip6_input.c	2009/01/19 13:20:14	1.122.2.1
+++ src/sys/netinet6/ip6_input.c	2009/04/28 07:37:23	1.122.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_input.c,v 1.122.2.1 2009/01/19 13:20:14 skrll Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.122.2.2 2009/04/28 07:37:23 skrll Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.122.2.1 2009/01/19 13:20:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.122.2.2 2009/04/28 07:37:23 skrll Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -960,7 +960,7 @@ ip6_process_hopopts(struct mbuf *m, u_in
 				return (-1);
 			}
 			optlen = IP6OPT_RTALERT_LEN;
-			bcopy((void *)(opt + 2), (void *)&rtalert_val, 2);
+			memcpy((void *)&rtalert_val, (void *)(opt + 2), 2);
 			*rtalertp = ntohs(rtalert_val);
 			break;
 		case IP6OPT_JUMBO:
@@ -995,7 +995,7 @@ ip6_process_hopopts(struct mbuf *m, u_in
 			 * We may see jumbolen in unaligned location, so
 			 * we'd need to perform bcopy().
 			 */
-			bcopy(opt + 2, &jumboplen, sizeof(jumboplen));
+			memcpy(&jumboplen, opt + 2, sizeof(jumboplen));
 			jumboplen = (u_int32_t)htonl(jumboplen);
 
 #if 1
@@ -1138,7 +1138,7 @@ ip6_savecontrol(struct in6pcb *in6p, str
 	if ((in6p->in6p_flags & IN6P_PKTINFO) != 0) {
 		struct in6_pktinfo pi6;
 
-		bcopy(&ip6->ip6_dst, &pi6.ipi6_addr, sizeof(struct in6_addr));
+		memcpy(&pi6.ipi6_addr, &ip6->ip6_dst, sizeof(struct in6_addr));
 		in6_clearscope(&pi6.ipi6_addr);	/* XXX */
 		pi6.ipi6_ifindex = m->m_pkthdr.rcvif ?
 		    m->m_pkthdr.rcvif->if_index : 0;
@@ -1578,7 +1578,7 @@ ip6_addaux(struct mbuf *m)
 		    M_NOWAIT);
 		if (mtag) {
 			m_tag_prepend(m, mtag);
-			bzero(mtag + 1, sizeof(struct ip6aux));
+			memset(mtag + 1, 0, sizeof(struct ip6aux));
 		}
 	}
 	return mtag;