Module Name: src
Committed By: yamt
Date: Mon Apr 25 22:05:05 UTC 2011
Modified Files:
src/sys/netinet6: in6_cksum.c
Log Message:
fix assertions
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/netinet6/in6_cksum.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/in6_cksum.c
diff -u src/sys/netinet6/in6_cksum.c:1.27 src/sys/netinet6/in6_cksum.c:1.28
--- src/sys/netinet6/in6_cksum.c:1.27 Mon Mar 10 22:34:40 2008
+++ src/sys/netinet6/in6_cksum.c Mon Apr 25 22:05:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_cksum.c,v 1.27 2008/03/10 22:34:40 yamt Exp $ */
+/* $NetBSD: in6_cksum.c,v 1.28 2011/04/25 22:05:05 yamt Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger <[email protected]>.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_cksum.c,v 1.27 2008/03/10 22:34:40 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_cksum.c,v 1.28 2011/04/25 22:05:05 yamt Exp $");
#include <sys/param.h>
#include <sys/mbuf.h>
@@ -60,14 +60,14 @@
const uint16_t *w;
const char *cp;
+ if (nxt == 0)
+ return cpu_in_cksum(m, len, off, 0);
+
if (__predict_false(off < sizeof(struct ip6_hdr)))
panic("in6_cksum: offset too short for IPv6 header");
if (__predict_false(m->m_len < sizeof(struct ip6_hdr)))
panic("in6_cksum: mbuf too short for IPv6 header");
- if (nxt == 0)
- return cpu_in_cksum(m, len, off, 0);
-
/*
* Compute the equivalent of:
* struct ip6_hdr_pseudo ip6;
