 @@ -1,14 +1,14 @@
-/*	$NetBSD: in_offload.c,v 1.4 2011/04/14 15:53:36 yamt Exp $	*/
+/*	$NetBSD: in_offload.c,v 1.5 2011/04/25 22:11:31 yamt Exp $	*/
 /*-
  * Copyright (c)2005, 2006 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_offload.c,v 1.4 2011/04/14 15:53:36 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_offload.c,v 1.5 2011/04/25 22:11:31 yamt Exp $");
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <netinet/in_offload.h>
 struct ip_tso_output_args {
 @@ -193,62 +193,64 @@ quit:
 	if (hdr != NULL) {
 		m_freem(hdr);
+	}
 	if (m != NULL) {
 		m_freem(m);
+	}
 	return error;
+}
 void
 ip_undefer_csum(struct mbuf *m, size_t hdrlen, int csum_flags)
+{
-	KASSERT(m->m_flags & M_PKTHDR);
+	const size_t iphdrlen = M_CSUM_DATA_IPv4_IPHL(m->m_pkthdr.csum_data);
 	KASSERT((m->m_pkthdr.csum_flags & csum_flags) == csum_flags);
 	uint16_t csum;
 	uint16_t ip_len;
 	uint16_t *csump;
 	size_t iphdrlen;
 	KASSERT(m->m_flags & M_PKTHDR);
 	KASSERT((m->m_pkthdr.csum_flags & csum_flags) == csum_flags);
 	if (__predict_true(hdrlen + sizeof(struct ip) <= m->m_len)) {
 		struct ip *ip = (struct ip *)(mtod(m, uint8_t *) + hdrlen);
 		ip_len = ip->ip_len;
 		iphdrlen = ip->ip_hl << 2;
 		csump = &ip->ip_sum;
 	} else {
-		uint8_t ip_vhl;
+		const size_t ip_len_offset =
-		const size_t ip_len_offset = hdrlen + offsetof(struct ip, ip_len);
+		    hdrlen + offsetof(struct ip, ip_len);
 		m_copydata(m, hdrlen, sizeof(ip_vhl), &ip_vhl);
 		m_copydata(m, ip_len_offset, sizeof(ip_len), &ip_len);
 		iphdrlen = (ip_vhl & 0x0f) << 2;
 		csump = NULL;
+	}
 	ip_len = ntohs(ip_len);
 	if (csum_flags & M_CSUM_IPv4) {
 		const size_t offset = hdrlen + offsetof(struct ip, ip_sum);
 		csum = in4_cksum(m, 0, hdrlen, iphdrlen);
 		if (csump != NULL) {
 			*csump = csum;
 		} else {
 			const size_t offset = hdrlen +
 			    offsetof(struct ip, ip_sum);
 			m_copyback(m, offset, sizeof(uint16_t), &csum);
+		}
+	}
 	if (csum_flags & (M_CSUM_UDPv4|M_CSUM_TCPv4)) {
-		size_t l4offset = hdrlen
+		size_t l4offset = hdrlen + iphdrlen;
 		    + M_CSUM_DATA_IPv4_IPHL(m->m_pkthdr.csum_data);
-		csum = in4_cksum(m, 0, hdrlen + l4offset, ip_len - l4offset);
+		csum = in4_cksum(m, 0, l4offset, ip_len - l4offset - hdrlen);
 		if (csum == 0 && (csum_flags & M_CSUM_UDPv4) != 0)
 			csum = 0xffff;
 		l4offset += M_CSUM_DATA_IPv4_OFFSET(m->m_pkthdr.csum_data);
 		if (__predict_true(l4offset + sizeof(uint16_t) <= m->m_len)) {
 			*(uint16_t *)(mtod(m, char *) + l4offset) = csum;
 		} else {
 			m_copyback(m, l4offset, sizeof(csum), (void *) &csum);
+		}
+	}
 	m->m_pkthdr.csum_flags ^= csum_flags;