Module Name: src
Committed By: bouyer
Date: Wed Jun 19 07:29:05 UTC 2013
Modified Files:
src/sys/netinet6 [netbsd-6]: ip6_flow.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #895):
sys/netinet6/ip6_flow.c: revision 1.21
Clear mbuf's csum_flags in ip6flow_fastforward(). Fixes PR#47849.
To generate a diff of this commit:
cvs rdiff -u -r1.19.2.1 -r1.19.2.2 src/sys/netinet6/ip6_flow.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/ip6_flow.c
diff -u src/sys/netinet6/ip6_flow.c:1.19.2.1 src/sys/netinet6/ip6_flow.c:1.19.2.2
--- src/sys/netinet6/ip6_flow.c:1.19.2.1 Wed Oct 31 16:07:46 2012
+++ src/sys/netinet6/ip6_flow.c Wed Jun 19 07:29:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_flow.c,v 1.19.2.1 2012/10/31 16:07:46 riz Exp $ */
+/* $NetBSD: ip6_flow.c,v 1.19.2.2 2013/06/19 07:29:05 bouyer Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_flow.c,v 1.19.2.1 2012/10/31 16:07:46 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_flow.c,v 1.19.2.2 2013/06/19 07:29:05 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -288,6 +288,11 @@ ip6flow_fastforward(struct mbuf **mp)
return 0;
}
+ /*
+ * Clear any in-bound checksum flags for this packet.
+ */
+ m->m_pkthdr.csum_flags = 0;
+
if (ip6->ip6_hlim <= IPV6_HLIMDEC)
return 0;