Module Name: src
Committed By: yamt
Date: Mon Apr 25 22:04:32 UTC 2011
Modified Files:
src/sys/netinet: in4_cksum.c
Log Message:
fix assertions
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/netinet/in4_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/netinet/in4_cksum.c
diff -u src/sys/netinet/in4_cksum.c:1.17 src/sys/netinet/in4_cksum.c:1.18
--- src/sys/netinet/in4_cksum.c:1.17 Tue Feb 12 13:05:55 2008
+++ src/sys/netinet/in4_cksum.c Mon Apr 25 22:04:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: in4_cksum.c,v 1.17 2008/02/12 13:05:55 joerg Exp $ */
+/* $NetBSD: in4_cksum.c,v 1.18 2011/04/25 22:04:32 yamt Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger <[email protected]>.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in4_cksum.c,v 1.17 2008/02/12 13:05:55 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in4_cksum.c,v 1.18 2011/04/25 22:04:32 yamt Exp $");
#include <sys/param.h>
#include <sys/mbuf.h>
@@ -50,14 +50,14 @@
uint32_t sum;
uint16_t *w;
+ if (nxt == 0)
+ return cpu_in_cksum(m, len, off, 0);
+
if (__predict_false(off < sizeof(struct ip)))
panic("in4_cksum: offset too short for IP header");
if (__predict_false(m->m_len < sizeof(struct ip)))
panic("in4_cksum: mbuf too short for IP header");
- if (nxt == 0)
- return cpu_in_cksum(m, len, off, 0);
-
/*
* Compute the equivalent of:
* struct ipovly ip;
