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_forward.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/ip6_forward.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.65.12.1
retrieving revision 1.66
diff -u -p -r1.65.12.1 -r1.66
--- src/sys/netinet6/ip6_forward.c	2009/11/14 09:45:53	1.65.12.1
+++ src/sys/netinet6/ip6_forward.c	2009/03/18 16:00:23	1.66
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_forward.c,v 1.65.12.1 2009/11/14 09:45:53 sborrill Exp $	*/
+/*	$NetBSD: ip6_forward.c,v 1.66 2009/03/18 16:00:23 cegger Exp $	*/
 /*	$KAME: ip6_forward.c,v 1.109 2002/09/11 08:10:17 sakane Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.65.12.1 2009/11/14 09:45:53 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.66 2009/03/18 16:00:23 cegger Exp $");
 
 #include "opt_ipsec.h"
 #include "opt_pfil_hooks.h"
@@ -120,10 +120,6 @@ ip6_forward(struct mbuf *m, int srcrt)
     int s;
 #endif
 
-	/*
-	 * Clear any in-bound checksum flags for this packet.
-	 */
-	m->m_pkthdr.csum_flags = 0;
 
 #ifdef IPSEC
 	/*
@@ -291,7 +287,7 @@ ip6_forward(struct mbuf *m, int srcrt)
 	 *
 	 * IPv6 [ESP|AH] IPv6 [extension headers] payload
 	 */
-	bzero(&state, sizeof(state));
+	memset(&state, 0, sizeof(state));
 	state.m = m;
 	state.ro = NULL;	/* update at ipsec6_output_tunnel() */
 	state.dst = NULL;	/* update at ipsec6_output_tunnel() */