 @@ -1,14 +1,14 @@
-/*	$NetBSD: pq3etsec.c,v 1.32 2017/10/23 09:23:48 msaitoh Exp $	*/
+/*	$NetBSD: pq3etsec.c,v 1.33 2018/06/01 08:56:00 maxv Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Raytheon BBN Technologies Corp and Defense Advanced Research Projects
  * Agency and which was developed by Matt Thomas of 3am Software Foundry.
+ *
  * This material is based upon work supported by the Defense Advanced Research
  * Projects Agency and Space and Naval Warfare Systems Center, Pacific, under
  * Contract No. N66001-09-C-2073.
  * Approved for Public Release, Distribution Unlimited
+ *
 @@ -31,27 +31,27 @@
  * 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 "opt_inet.h"
 #include "opt_mpc85xx.h"
 #include "opt_multiprocessor.h"
 #include "opt_net_mpsafe.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.32 2017/10/23 09:23:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.33 2018/06/01 08:56:00 maxv Exp $");
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/mbuf.h>
 #include <sys/ioctl.h>
 #include <sys/intr.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/atomic.h>
 #include <sys/callout.h>
 @@ -2053,27 +2053,27 @@ pq3etsec_tx_offload(
 	if (have_vtag) {
 		flags |= TXFCB_VLN;
+	}
 	if (flags == 0) {
 		m->m_flags &= ~M_HASFCB;
 		return;
+	}
 	struct txfcb fcb;
 	fcb.txfcb_flags = flags;
 	if (csum_flags & M_CSUM_IPv4)
 		fcb.txfcb_l4os = M_CSUM_DATA_IPv4_IPHL(m->m_pkthdr.csum_data);
 	else
-		fcb.txfcb_l4os = M_CSUM_DATA_IPv6_HL(m->m_pkthdr.csum_data);
+		fcb.txfcb_l4os = M_CSUM_DATA_IPv6_IPHL(m->m_pkthdr.csum_data);
 	fcb.txfcb_l3os = ETHER_HDR_LEN;
 	fcb.txfcb_phcs = 0;
 	fcb.txfcb_vlctl = vtag;
 #if 0
 	printf("%s: csum_flags=%#x: txfcb flags=%#x lsos=%u l4os=%u phcs=%u vlctl=%#x\n",
 	    __func__, csum_flags, fcb.txfcb_flags, fcb.txfcb_l3os, fcb.txfcb_l4os,
 	    fcb.txfcb_phcs, fcb.txfcb_vlctl);
 #endif
 	if (M_LEADINGSPACE(m) >= sizeof(fcb)) {
 		m->m_data -= sizeof(fcb);
 		m->m_len += sizeof(fcb);

 @@ -1,35 +1,35 @@
-/*	$NetBSD: if_vmx.c,v 1.24 2018/04/16 09:12:52 nonaka Exp $	*/
+/*	$NetBSD: if_vmx.c,v 1.25 2018/06/01 08:56:00 maxv Exp $	*/
 /*	$OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $	*/
 /*
  * Copyright (c) 2013 Tsubai Masanari
  * Copyright (c) 2013 Bryan Venteicher <bryanv@FreeBSD.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.24 2018/04/16 09:12:52 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.25 2018/06/01 08:56:00 maxv Exp $");
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 @@ -2526,27 +2526,27 @@ vmxnet3_txq_offload_ctx(struct vmxnet3_t
 	case ETHERTYPE_VLAN:
 		offset = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN;
 		break;
 	default:
 		m_freem(m);
 		return (EINVAL);
+	}
 	if ((m->m_pkthdr.csum_flags &
 	    (M_CSUM_TSOv4|M_CSUM_UDPv4|M_CSUM_TCPv4)) != 0) {
 		iphl = M_CSUM_DATA_IPv4_IPHL(m->m_pkthdr.csum_data);
 		v4 = true;
 	} else {
-		iphl = M_CSUM_DATA_IPv6_HL(m->m_pkthdr.csum_data);
+		iphl = M_CSUM_DATA_IPv6_IPHL(m->m_pkthdr.csum_data);
 		v4 = false;
+	}
 	*start = offset + iphl;
 	if (m->m_pkthdr.csum_flags &
 	    (M_CSUM_TCPv4 | M_CSUM_TCPv6 | M_CSUM_TSOv4 | M_CSUM_TSOv6)) {
 		csum_off = offsetof(struct tcphdr, th_sum);
 	} else {
 		csum_off = offsetof(struct udphdr, uh_sum);
+	}
 	*csum_start = *start + csum_off;
 	mp = m_pulldown(m, 0, *csum_start + 2, &offp);

 @@ -1,41 +1,41 @@
-/*	$NetBSD: if_mvxpe.c,v 1.17 2016/12/15 09:28:05 ozaki-r Exp $	*/
+/*	$NetBSD: if_mvxpe.c,v 1.18 2018/06/01 08:56:00 maxv Exp $	*/
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND 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 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: if_mvxpe.c,v 1.17 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.18 2018/06/01 08:56:00 maxv Exp $");
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/evcnt.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 @@ -2229,27 +2229,27 @@ mvxpe_tx_set_csumflag(struct ifnet *ifp,
 	case ETHERTYPE_IPV6:
 		ipoff = ETHER_HDR_LEN;
 		break;
 	case ETHERTYPE_VLAN:
 		ipoff = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN;
 		break;
+	}
 	if (csum_flags & (M_CSUM_IPv4|M_CSUM_TCPv4|M_CSUM_UDPv4)) {
 		iphl = M_CSUM_DATA_IPv4_IPHL(m->m_pkthdr.csum_data);
 		t->command |= MVXPE_TX_CMD_L3_IP4;
+	}
 	else if (csum_flags & (M_CSUM_TCPv6|M_CSUM_UDPv6)) {
-		iphl = M_CSUM_DATA_IPv6_HL(m->m_pkthdr.csum_data);
+		iphl = M_CSUM_DATA_IPv6_IPHL(m->m_pkthdr.csum_data);
 		t->command |= MVXPE_TX_CMD_L3_IP6;
+	}
 	else {
 		t->command |= MVXPE_TX_CMD_L4_CHECKSUM_NONE;
 		return;
+	}
 	/* L3 */
 	if (csum_flags & M_CSUM_IPv4) {
 		t->command |= MVXPE_TX_CMD_IP4_CHECKSUM;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_jme.c,v 1.32 2017/09/26 07:42:06 knakahara Exp $	*/
+/*	$NetBSD: if_jme.c,v 1.33 2018/06/01 08:56:00 maxv Exp $	*/
 /*
  * Copyright (c) 2008 Manuel Bouyer.  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.
+ *
 @@ -48,27 +48,27 @@
  * 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.
  */
 /*
  * Driver for JMicron Technologies JMC250 (Giganbit) and JMC260 (Fast)
  * Ethernet Controllers.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.32 2017/09/26 07:42:06 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.33 2018/06/01 08:56:00 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>	/* only for declaration of wakeup() used by vm.h */
 #include <sys/device.h>
 @@ -1351,27 +1351,27 @@ jme_encap(struct jme_softc *sc, struct m
 	if (((*m_head)->m_pkthdr.csum_flags & (M_CSUM_TSOv4|M_CSUM_TSOv6)) != 0){
 		/*
 		 * Due to the adherence to NDIS specification JMC250
 		 * assumes upper stack computed TCP pseudo checksum
 		 * without including payload length. This breaks
 		 * checksum offload for TSO case so recompute TCP
 		 * pseudo checksum for JMC250. Hopefully this wouldn't
 		 * be much burden on modern CPUs.
 		 */
 		bool v4 = ((*m_head)->m_pkthdr.csum_flags & M_CSUM_TSOv4) != 0;
 		int iphl = v4 ?
 		    M_CSUM_DATA_IPv4_IPHL((*m_head)->m_pkthdr.csum_data) :
-		    M_CSUM_DATA_IPv6_HL((*m_head)->m_pkthdr.csum_data);
+		    M_CSUM_DATA_IPv6_IPHL((*m_head)->m_pkthdr.csum_data);
 		/*
 		 * note: we support vlan offloading, so we should never have
 		 * a ETHERTYPE_VLAN packet here - so ETHER_HDR_LEN is always
 		 * right.
 		 */
 		int hlen = ETHER_HDR_LEN + iphl;
 		if (__predict_false((*m_head)->m_len <
 		    (hlen + sizeof(struct tcphdr)))) {
 			   /*
 			    * TCP/IP headers are not in the first mbuf; we need
 			    * to do this the slow and painful way.  Let's just
 			    * hope this doesn't happen very often.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_wm.c,v 1.580 2018/05/25 04:40:26 ozaki-r Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.581 2018/06/01 08:56:00 maxv Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * 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
 @@ -73,27 +73,27 @@
  * TODO (in order of importance):
+ *
  *	- Check XXX'ed comments
  *	- TX Multi queue improvement (refine queue selection logic)
  *	- Split header buffer for newer descriptors
  *	- EEE (Energy Efficiency Ethernet)
  *	- Virtual Function
  *	- Set LED correctly (based on contents in EEPROM)
  *	- Rework how parameters are loaded from the EEPROM.
  *	- Image Unique ID
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.580 2018/05/25 04:40:26 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.581 2018/06/01 08:56:00 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #include "opt_if_wm.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 @@ -6907,27 +6907,27 @@ wm_tx_offload(struct wm_softc *sc, struc
 	default:
 		/*
 		 * Don't support this protocol or encapsulation.
 		 */
 		*fieldsp = 0;
 		*cmdp = 0;
 		return 0;
+	}
 	if ((m0->m_pkthdr.csum_flags &
 	    (M_CSUM_TSOv4 | M_CSUM_UDPv4 | M_CSUM_TCPv4 | M_CSUM_IPv4)) != 0) {
 		iphl = M_CSUM_DATA_IPv4_IPHL(m0->m_pkthdr.csum_data);
 	} else {
-		iphl = M_CSUM_DATA_IPv6_HL(m0->m_pkthdr.csum_data);
+		iphl = M_CSUM_DATA_IPv6_IPHL(m0->m_pkthdr.csum_data);
+	}
 	ipcse = offset + iphl - 1;
 	cmd = WTX_CMD_DEXT | WTX_DTYP_D;
 	cmdlen = WTX_CMD_DEXT | WTX_DTYP_C | WTX_CMD_IDE;
 	seg = 0;
 	fields = 0;
 	if ((m0->m_pkthdr.csum_flags & (M_CSUM_TSOv4 | M_CSUM_TSOv6)) != 0) {
 		int hlen = offset + iphl;
 		bool v4 = (m0->m_pkthdr.csum_flags & M_CSUM_TSOv4) != 0;
 		if (__predict_false(m0->m_len <
 @@ -7514,27 +7514,27 @@ wm_nq_tx_offload(struct wm_softc *sc, st
 		return 0;
+	}
 	*do_csum = true;
 	*cmdlenp = NQTX_DTYP_D | NQTX_CMD_DEXT | NQTX_CMD_IFCS;
 	cmdc = NQTX_DTYP_C | NQTX_CMD_DEXT;
 	vl_len = (offset << NQTXC_VLLEN_MACLEN_SHIFT);
 	KASSERT((offset & ~NQTXC_VLLEN_MACLEN_MASK) == 0);
 	if ((m0->m_pkthdr.csum_flags &
 	    (M_CSUM_TSOv4 | M_CSUM_UDPv4 | M_CSUM_TCPv4 | M_CSUM_IPv4)) != 0) {
 		iphl = M_CSUM_DATA_IPv4_IPHL(m0->m_pkthdr.csum_data);
 	} else {
-		iphl = M_CSUM_DATA_IPv6_HL(m0->m_pkthdr.csum_data);
+		iphl = M_CSUM_DATA_IPv6_IPHL(m0->m_pkthdr.csum_data);
+	}
 	vl_len |= (iphl << NQTXC_VLLEN_IPLEN_SHIFT);
 	KASSERT((iphl & ~NQTXC_VLLEN_IPLEN_MASK) == 0);
 	if (vlan_has_tag(m0)) {
 		vl_len |= ((vlan_get_tag(m0) & NQTXC_VLLEN_VLAN_MASK)
 		     << NQTXC_VLLEN_VLAN_SHIFT);
 		*cmdlenp |= NQTX_CMD_VLE;
+	}
 	mssidx = 0;
 	if ((m0->m_pkthdr.csum_flags & (M_CSUM_TSOv4 | M_CSUM_TSOv6)) != 0) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: in6_offload.c,v 1.7 2017/02/14 03:05:06 ozaki-r Exp $	*/
+/*	$NetBSD: in6_offload.c,v 1.8 2018/06/01 08:56:00 maxv Exp $	*/
 /*-
  * Copyright (c)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: in6_offload.c,v 1.7 2017/02/14 03:05:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_offload.c,v 1.8 2018/06/01 08:56:00 maxv Exp $");
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip6.h>
 #include <netinet/tcp.h>
 #include <netinet6/in6_var.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/nd6.h>
 @@ -204,27 +204,27 @@ ip6_undefer_csum(struct mbuf *m, size_t
 	uint16_t csum;
 	KASSERT(m->m_flags & M_PKTHDR);
 	KASSERT((m->m_pkthdr.csum_flags & csum_flags) == csum_flags);
 	KASSERT(csum_flags == M_CSUM_UDPv6 || csum_flags == M_CSUM_TCPv6);
 	if (__predict_true(hdrlen + sizeof(struct ip6_hdr) <= m->m_len)) {
 		plen = *(uint16_t *)(mtod(m, char *) + ip6_plen_offset);
 	} else {
 		m_copydata(m, ip6_plen_offset, sizeof(plen), &plen);
+	}
 	plen = ntohs(plen);
-	l4hdroff = M_CSUM_DATA_IPv6_HL(m->m_pkthdr.csum_data);
+	l4hdroff = M_CSUM_DATA_IPv6_IPHL(m->m_pkthdr.csum_data);
 	l4offset = hdrlen + l4hdroff;
 	csum = in6_cksum(m, 0, l4offset, plen - l4hdroff);
 	if (csum == 0 && (csum_flags & M_CSUM_UDPv6) != 0)
 		csum = 0xffff;
 	l4offset += M_CSUM_DATA_IPv6_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);
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip6_output.c,v 1.210 2018/05/29 16:21:30 maxv Exp $	*/
+/*	$NetBSD: ip6_output.c,v 1.211 2018/06/01 08:56:00 maxv Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * 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
 @@ -52,27 +52,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.210 2018/05/29 16:21:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.211 2018/06/01 08:56:00 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
 #endif
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/errno.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 @@ -231,27 +231,27 @@ ip6_output(
 		panic("ip6_output: no HDR");
 	if ((m->m_pkthdr.csum_flags &
 	    (M_CSUM_TCPv4|M_CSUM_UDPv4|M_CSUM_TSOv4)) != 0) {
 		panic("ip6_output: IPv4 checksum offload flags: %d",
 		    m->m_pkthdr.csum_flags);
+	}
 	if ((m->m_pkthdr.csum_flags & (M_CSUM_TCPv6|M_CSUM_UDPv6)) ==
 	    (M_CSUM_TCPv6|M_CSUM_UDPv6)) {
 		panic("ip6_output: conflicting checksum offload flags: %d",
 		    m->m_pkthdr.csum_flags);
+	}
 #endif
-	M_CSUM_DATA_IPv6_HL_SET(m->m_pkthdr.csum_data, sizeof(struct ip6_hdr));
+	M_CSUM_DATA_IPv6_SET(m->m_pkthdr.csum_data, sizeof(struct ip6_hdr));
 #define MAKE_EXTHDR(hp, mp)						\
     do {								\
 	if (hp) {							\
 		struct ip6_ext *eh = (struct ip6_ext *)(hp);		\
 		error = ip6_copyexthdr((mp), (void *)(hp), 		\
 		    ((eh)->ip6e_len + 1) << 3);				\
 		if (error)						\
 			goto freehdrs;					\
 	}								\
     } while (/*CONSTCOND*/ 0)
 	memset(&exthdrs, 0, sizeof(exthdrs));
 @@ -390,27 +390,27 @@ ip6_output(
 	}\
     } while (/*CONSTCOND*/ 0)
 		/*
 		 * result: IPv6 hbh dest1 rthdr dest2 payload
 		 * m will point to IPv6 header.  mprev will point to the
 		 * extension header prior to dest2 (rthdr in the above case).
 		 */
 		MAKE_CHAIN(exthdrs.ip6e_hbh, mprev, nexthdrp, IPPROTO_HOPOPTS);
 		MAKE_CHAIN(exthdrs.ip6e_dest1, mprev, nexthdrp,
 		    IPPROTO_DSTOPTS);
 		MAKE_CHAIN(exthdrs.ip6e_rthdr, mprev, nexthdrp,
 		    IPPROTO_ROUTING);
-		M_CSUM_DATA_IPv6_HL_SET(m->m_pkthdr.csum_data,
+		M_CSUM_DATA_IPv6_SET(m->m_pkthdr.csum_data,
 		    sizeof(struct ip6_hdr) + optlen);
+	}
 	/* Need to save for pmtu */
 	finaldst = ip6->ip6_dst;
 	/*
 	 * If there is a routing header, replace destination address field
 	 * with the first hop of the routing header.
 	 */
 	if (exthdrs.ip6e_rthdr) {
 		struct ip6_rthdr *rh;
 @@ -1074,27 +1074,27 @@ ip6_copyexthdr(struct mbuf **mp, void *h
 /*
  * Process a delayed payload checksum calculation.
  */
 void
 in6_delayed_cksum(struct mbuf *m)
+{
 	uint16_t csum, offset;
 	KASSERT((m->m_pkthdr.csum_flags & (M_CSUM_UDPv6|M_CSUM_TCPv6)) != 0);
 	KASSERT((~m->m_pkthdr.csum_flags & (M_CSUM_UDPv6|M_CSUM_TCPv6)) != 0);
 	KASSERT((m->m_pkthdr.csum_flags
 	    & (M_CSUM_UDPv4|M_CSUM_TCPv4|M_CSUM_TSOv4)) == 0);
-	offset = M_CSUM_DATA_IPv6_HL(m->m_pkthdr.csum_data);
+	offset = M_CSUM_DATA_IPv6_IPHL(m->m_pkthdr.csum_data);
 	csum = in6_cksum(m, 0, offset, m->m_pkthdr.len - offset);
 	if (csum == 0 && (m->m_pkthdr.csum_flags & M_CSUM_UDPv6) != 0) {
 		csum = 0xffff;
+	}
 	offset += M_CSUM_DATA_IPv6_OFFSET(m->m_pkthdr.csum_data);
 	if ((offset + sizeof(csum)) > m->m_len) {
 		m_copyback(m, offset, sizeof(csum), &csum);
 	} else {
 		*(uint16_t *)(mtod(m, char *) + offset) = csum;
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mbuf.h,v 1.206 2018/05/18 18:52:17 maxv Exp $	*/
+/*	$NetBSD: mbuf.h,v 1.207 2018/06/01 08:56:00 maxv Exp $	*/
 /*
  * Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and Matt Thomas of 3am Software Foundry.
+ *
  * 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
 @@ -156,27 +156,27 @@ struct m_hdr {
 	int	mh_flags;		/* flags; see below */
 	paddr_t	mh_paddr;		/* physical address of mbuf */
 	short	mh_type;		/* type of data in this mbuf */
 };
 /*
  * record/packet header in first mbuf of chain; valid if M_PKTHDR set
+ *
  * A note about csum_data:
+ *
  *  o For the out-bound direction, the low 16 bits indicates the offset after
  *    the L4 header where the final L4 checksum value is to be stored and the
  *    high 16 bits is the length of the L3 header (the start of the data to
- *    be checksummed):
+ *    be checksummed).
+ *
  *  o For the in-bound direction, it is only valid if the M_CSUM_DATA flag is
  *    set. In this case, an L4 checksum has been calculated by hardware and
  *    is stored in csum_data, but it is up to software to perform final
  *    verification.
+ *
  * Note for in-bound TCP/UDP checksums: we expect the csum_data to NOT
  * be bit-wise inverted (the final step in the calculation of an IP
  * checksum) -- this is so we can accumulate the checksum for fragmented
  * packets during reassembly.
+ *
  * Size ILP32: 40
  *       LP64: 56
 @@ -217,44 +217,38 @@ struct pkthdr {
 #define	M_CSUM_TSOv6		0x00000200	/* TCPv6 segmentation offload */
 /* Checksum-assist quirks: keep separate from jump-table bits. */
 #define	M_CSUM_NO_PSEUDOHDR	0x80000000	/* Rx csum_data does not include
 						 * the UDP/TCP pseudo-hdr, and
 						 * is not yet 1s-complemented.
 						 */
 #define M_CSUM_BITS \
     "\20\1TCPv4\2UDPv4\3TCP_UDP_BAD\4DATA\5TCPv6\6UDPv6\7IPv4\10IPv4_BAD" \
     "\11TSOv4\12TSOv6\40NO_PSEUDOHDR"
 /*
- * Macros for manipulating csum_data on outgoing packets.  These are
+ * Macros for manipulating csum_data on outgoing packets. These are
  * used to pass information down from the L4/L3 to the L2.
+ *
  *   _IPHL:   Length of the IPv{4/6} header, plus the options; in other
  *            words the offset of the UDP/TCP header in the packet.
  *   _OFFSET: Offset of the checksum field in the UDP/TCP header.
  */
 #define	M_CSUM_DATA_IPv4_IPHL(x)	((x) >> 16)
 #define	M_CSUM_DATA_IPv4_OFFSET(x)	((x) & 0xffff)
 #define	M_CSUM_DATA_IPv6_IPHL(x)	((x) >> 16)
 /*
  * Macros for M_CSUM_TCPv6 and M_CSUM_UDPv6
  * M_CSUM_DATA_IPv6_HL: length of ip6_hdr + ext header.
  * ie. offset of UDP/TCP header in the packet.
  * M_CSUM_DATA_IPv6_OFFSET: offset of the checksum field in UDP/TCP header.
  */
 #define	M_CSUM_DATA_IPv6_HL(x)		((x) >> 16)
 #define	M_CSUM_DATA_IPv6_HL_SET(x, v)	(x) = ((x) & 0xffff) | ((v) << 16)
 #define	M_CSUM_DATA_IPv6_OFFSET(x)	((x) & 0xffff)
 #define	M_CSUM_DATA_IPv6_SET(x, v)	(x) = ((x) & 0xffff) | ((v) << 16)
 /*
  * Max # of pages we can attach to m_ext.  This is carefully chosen
  * to be able to handle SOSEND_LOAN_CHUNK with our minimum sized page.
  */
 #ifdef MIN_PAGE_SIZE
 #define	M_EXT_MAXPAGES		((65536 / MIN_PAGE_SIZE) + 1)
 #endif
 /*
  * Description of external storage mapped into mbuf, valid if M_EXT set.
  */
 struct _m_ext_storage {