 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_enet.c,v 1.15 2018/09/03 16:29:23 riastradh Exp $	*/
+/*	$NetBSD: if_enet.c,v 1.16 2018/12/22 13:11:37 maxv Exp $	*/
 /*
  * Copyright (c) 2014 Ryo Shimizu <ryo@nerv.org>
  * 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.
 @@ -21,27 +21,27 @@
  * (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.
  */
 /*
  * i.MX6,7 10/100/1000-Mbps ethernet MAC (ENET)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.15 2018/09/03 16:29:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.16 2018/12/22 13:11:37 maxv Exp $");
 #include "vlan.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/mbuf.h>
 #include <sys/device.h>
 #include <sys/sockio.h>
 #include <sys/kernel.h>
 #include <sys/rndsource.h>
 #include <lib/libkern/libkern.h>
 @@ -1495,27 +1495,27 @@ enet_encap_mbufalign(struct mbuf **mp)
 				} else {
 					/*
 					 * no space to align data. (M_READONLY?)
 					 * allocate new mbuf aligned,
 					 * and copy to it.
 					 */
 					MGET(x, M_DONTWAIT, m->m_type);
 					if (x == NULL) {
 						m_freem(m);
 						return ENOBUFS;
+					}
 					MCLAIM(x, m->m_owner);
 					if (m->m_flags & M_PKTHDR)
-						M_MOVE_PKTHDR(x, m);
+						m_move_pkthdr(x, m);
 					x->m_len = m->m_len;
 					x->m_data = ALIGN_PTR(x->m_data,
 					    ALIGNBYTE);
 					memcpy(mtod(x, void *), mtod(m, void *),
 					    m->m_len);
 					p->m_next = x;
 					x->m_next = m_free(m);
 					m = x;
+				}
+			}
 			/*
 			 * fill 1st mbuf at least 10byte
 @@ -1620,27 +1620,27 @@ enet_encap_mbufalign(struct mbuf **mp)
+			 *
 			 */
 			if (alignoff != 0) {
 				/* at least ALIGNBYTE */
 				chiplen = ALIGNBYTE - alignoff + ALIGNBYTE;
 				MGET(x, M_DONTWAIT, m->m_type);
 				if (x == NULL) {
 					m_freem(m);
 					return ENOBUFS;
+				}
 				MCLAIM(x, m->m_owner);
 				if (m->m_flags & M_PKTHDR)
-					M_MOVE_PKTHDR(x, m);
+					m_move_pkthdr(x, m);
 				x->m_data = ALIGN_PTR(x->m_data, ALIGNBYTE);
 				memcpy(mtod(x, void *), mtod(m, void *),
 				    chiplen);
 				x->m_len = chiplen;
 				x->m_next = m;
 				m_adj(m, chiplen);
 				if (p == NULL)
 					m0 = x;
 				else
 					p->m_next = x;
+			}
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pq3etsec.c,v 1.37 2018/09/03 16:29:26 riastradh Exp $	*/
+/*	$NetBSD: pq3etsec.c,v 1.38 2018/12/22 13:11:37 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.37 2018/09/03 16:29:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.38 2018/12/22 13:11:37 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>
 @@ -2097,27 +2097,27 @@ pq3etsec_tx_offload(
 #ifdef INET6
 				in6_undefer_cksum(m, ETHER_HDR_LEN,
 				    csum_flags & M_CSUM_IP6);
 #else
 				panic("%s: impossible M_CSUM flags %#x",
 				    device_xname(sc->sc_dev), csum_flags);
 #endif
+			}
 			m->m_flags &= ~M_HASFCB;
 			return;
+		}
-		M_MOVE_PKTHDR(mn, m);
+		m_move_pkthdr(mn, m);
 		mn->m_next = m;
 		m = mn;
 		MH_ALIGN(m, sizeof(fcb));
 		m->m_len = sizeof(fcb);
 		*mp = m;
+	}
 	m->m_pkthdr.len += sizeof(fcb);
 	m->m_flags |= M_HASFCB;
 	*mtod(m, struct txfcb *) = fcb;
 	return;
+}
 static bool

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uipc_mbuf.c,v 1.225 2018/11/15 10:56:30 maxv Exp $	*/
+/*	$NetBSD: uipc_mbuf.c,v 1.226 2018/12/22 13:11:37 maxv Exp $	*/
 /*
  * Copyright (c) 1999, 2001 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.
+ *
  * 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
 @@ -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.
+ *
  *	@(#)uipc_mbuf.c	8.4 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.225 2018/11/15 10:56:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.226 2018/12/22 13:11:37 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_mbuftrace.h"
 #include "opt_nmbclusters.h"
 #include "opt_ddb.h"
 #include "ether.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/proc.h>
 @@ -627,27 +627,27 @@ m_prepend(struct mbuf *m, int len, int h
 	if (__predict_false(len > MHLEN)) {
 		panic("%s: len > MHLEN", __func__);
+	}
 	KASSERT(len != M_COPYALL);
 	mn = m_get(how, m->m_type);
 	if (mn == NULL) {
 		m_freem(m);
 		return NULL;
+	}
 	if (m->m_flags & M_PKTHDR) {
-		M_MOVE_PKTHDR(mn, m);
+		m_move_pkthdr(mn, m);
 	} else {
 		MCLAIM(mn, m->m_owner);
+	}
 	mn->m_next = m;
 	m = mn;
 	if (m->m_flags & M_PKTHDR) {
 		if (len < MHLEN)
 			MH_ALIGN(m, len);
 	} else {
 		if (len < MLEN)
 			M_ALIGN(m, len);
+	}
 @@ -985,27 +985,27 @@ m_ensure_contig(struct mbuf **m0, int le
 		m = n;
 		n = n->m_next;
 		len -= m->m_len;
 	} else {
 		if (len > MHLEN) {
 			return false;
+		}
 		m = m_get(M_DONTWAIT, n->m_type);
 		if (m == NULL) {
 			return false;
+		}
 		MCLAIM(m, n->m_owner);
 		if (n->m_flags & M_PKTHDR) {
-			M_MOVE_PKTHDR(m, n);
+			m_move_pkthdr(m, n);
+		}
+	}
 	space = &m->m_dat[MLEN] - (m->m_data + m->m_len);
 	do {
 		count = MIN(MIN(MAX(len, max_protohdr), space), n->m_len);
 		memcpy(mtod(m, char *) + m->m_len, mtod(n, void *),
 		  (unsigned)count);
 		len -= count;
 		m->m_len += count;
 		n->m_len -= count;
 		space -= count;
 		if (n->m_len)
 			n->m_data += count;
 @@ -1206,27 +1206,27 @@ struct mbuf *
 m_copyup(struct mbuf *n, int len, int dstoff)
+{
 	struct mbuf *m;
 	int count, space;
 	KASSERT(len != M_COPYALL);
 	if (len > ((int)MHLEN - dstoff))
 		goto bad;
 	m = m_get(M_DONTWAIT, n->m_type);
 	if (m == NULL)
 		goto bad;
 	MCLAIM(m, n->m_owner);
 	if (n->m_flags & M_PKTHDR) {
-		M_MOVE_PKTHDR(m, n);
+		m_move_pkthdr(m, n);
+	}
 	m->m_data += dstoff;
 	space = &m->m_dat[MLEN] - (m->m_data + m->m_len);
 	do {
 		count = uimin(uimin(uimax(len, max_protohdr), space), n->m_len);
 		memcpy(mtod(m, char *) + m->m_len, mtod(n, void *),
 		    (unsigned)count);
 		len -= count;
 		m->m_len += count;
 		n->m_len -= count;
 		space -= count;
 		if (n->m_len)
 			n->m_data += count;
 @@ -1574,27 +1574,27 @@ extend:
 			/*
 			 * XXX TODO coalesce into the trailingspace of
 			 * the previous mbuf when possible.
 			 */
 			/*
 			 * allocate a new mbuf.  copy packet header if needed.
 			 */
 			n = m_get(how, m->m_type);
 			if (n == NULL)
 				goto enobufs;
 			MCLAIM(n, m->m_owner);
 			if (off == 0 && (m->m_flags & M_PKTHDR) != 0) {
-				M_MOVE_PKTHDR(n, m);
+				m_move_pkthdr(n, m);
 				n->m_len = MHLEN;
 			} else {
 				if (len >= MINCLSIZE)
 					MCLGET(n, M_DONTWAIT);
 				n->m_len =
 				    (n->m_flags & M_EXT) ? MCLBYTES : MLEN;
+			}
 			if (n->m_len > len)
 				n->m_len = len;
 			/*
 			 * free the region which has been overwritten.
 			 * copying data from old mbufs if requested.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_l2tp.c,v 1.30 2018/10/19 00:12:56 knakahara Exp $	*/
+/*	$NetBSD: if_l2tp.c,v 1.31 2018/12/22 13:11:37 maxv Exp $	*/
 /*
  * Copyright (c) 2017 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.
 @@ -21,27 +21,27 @@
  * 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.
  */
 /*
  * L2TPv3 kernel interface
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.30 2018/10/19 00:12:56 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.31 2018/12/22 13:11:37 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/errno.h>
 @@ -496,27 +496,27 @@ l2tp_input(struct mbuf *m, struct ifnet
+		}
 		if (m->m_len < copy_length) {
 			m = m_pullup(m, copy_length);
 			if (m == NULL)
 				return;
+		}
 		MGETHDR(m_head, M_DONTWAIT, MT_HEADER);
 		if (m_head == NULL) {
 			m_freem(m);
 			return;
+		}
-		M_MOVE_PKTHDR(m_head, m);
+		m_move_pkthdr(m_head, m);
 		/*
 		 * m_head should be:
 		 *                             L2TP_COPY_LENGTH
 		 *                          <-  + roundup(pad, 4) - pad ->
 		 *   +-------+--------+-----+--------------+-------------+
 		 *   | m_hdr | pkthdr | ... | ether header |   payload   |
 		 *   +-------+--------+-----+--------------+-------------+
 		 *                          ^              ^
 		 *                          m_data         4 byte aligned
 		 */
 		MH_ALIGN(m_head, L2TP_COPY_LENGTH + roundup(pad, 4));
 		m_head->m_data += pad;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_sl.c,v 1.129 2018/04/20 09:56:22 knakahara Exp $	*/
+/*	$NetBSD: if_sl.c,v 1.130 2018/12/22 13:11:37 maxv Exp $	*/
 /*
  * Copyright (c) 1987, 1989, 1992, 1993
  *	The Regents of the University of California.  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.
 @@ -50,27 +50,27 @@
  * Converted to 4.3BSD Beta by Chris Torek.
  * Other changes made at Berkeley, based in part on code by Kirk Smith.
  * W. Jolitz added slip abort.
+ *
  * Hacked almost beyond recognition by Van Jacobson (van@helios.ee.lbl.gov).
  * Added priority queuing for "interactive" traffic; hooks for TCP
  * header compression; ICMP filtering (at 2400 baud, some cretin
  * pinging you can use up all your bandwidth).  Made low clist behavior
  * more robust and slightly less likely to hang serial line.
  * Sped up a bunch of things.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.129 2018/04/20 09:56:22 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.130 2018/12/22 13:11:37 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/dkstat.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 @@ -936,27 +936,27 @@ slintr(void *arg)
 			if (m == NULL)
 				continue;
+		}
 		/*
 		 * If the packet will fit into a single
 		 * header mbuf, try to copy it into one,
 		 * to save memory.
 		 */
 		if ((m->m_pkthdr.len < MHLEN) &&
 		    (n = m_gethdr(M_DONTWAIT, MT_DATA))) {
 			int pktlen;
 			pktlen = m->m_pkthdr.len;
-			M_MOVE_PKTHDR(n, m);
+			m_move_pkthdr(n, m);
 			memcpy(mtod(n, void *), mtod(m, void *), pktlen);
 			n->m_len = m->m_len;
 			m_freem(m);
 			m = n;
+		}
 		sc->sc_if.if_ipackets++;
 		getbinuptime(&sc->sc_lastpacket);
 #ifdef INET
 		s = splnet();
 		if (__predict_false(!pktq_enqueue(ip_pktq, m, 0))) {
 			sc->sc_if.if_ierrors++;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_strip.c,v 1.110 2018/06/06 01:49:09 maya Exp $	*/
+/*	$NetBSD: if_strip.c,v 1.111 2018/12/22 13:11:37 maxv Exp $	*/
 /*	from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $	*/
 /*
  * Copyright 1996 The Board of Trustees of The Leland Stanford
  * Junior University. All Rights Reserved.
+ *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
  * fee is hereby granted, provided that the above copyright
  * notice appear in all copies.  Stanford University
  * makes no representations about the suitability of this
  * software for any purpose.  It is provided "as is" without
  * express or implied warranty.
 @@ -77,27 +77,27 @@
  * Converted to 4.3BSD Beta by Chris Torek.
  * Other changes made at Berkeley, based in part on code by Kirk Smith.
  * W. Jolitz added slip abort.
+ *
  * Hacked almost beyond recognition by Van Jacobson (van@helios.ee.lbl.gov).
  * Added priority queuing for "interactive" traffic; hooks for TCP
  * header compression; ICMP filtering (at 2400 baud, some cretin
  * pinging you can use up all your bandwidth).  Made low clist behavior
  * more robust and slightly less likely to hang serial line.
  * Sped up a bunch of things.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.110 2018/06/06 01:49:09 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.111 2018/12/22 13:11:37 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/dkstat.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 @@ -1228,27 +1228,27 @@ stripintr(void *arg)
 			if (m == NULL)
 				continue;
+		}
 		/*
 		 * If the packet will fit into a single
 		 * header mbuf, try to copy it into one,
 		 * to save memory.
 		 */
 		if ((m->m_pkthdr.len < MHLEN) &&
 		    (n = m_gethdr(M_DONTWAIT, MT_DATA))) {
 			int pktlen;
 			pktlen = m->m_pkthdr.len;
-			M_MOVE_PKTHDR(n, m);
+			m_move_pkthdr(n, m);
 			memcpy(mtod(n, void *), mtod(m, void *), pktlen);
 			n->m_len = m->m_len;
 			m_freem(m);
 			m = n;
+		}
 		sc->sc_if.if_ipackets++;
 		getbinuptime(&sc->sc_lastpacket);
 #ifdef INET
 		s = splnet();
 		if (__predict_false(!pktq_enqueue(ip_pktq, m, 0))) {
 			sc->sc_if.if_ierrors++;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ieee80211_input.c,v 1.114 2018/06/26 06:48:03 msaitoh Exp $	*/
+/*	$NetBSD: ieee80211_input.c,v 1.115 2018/12/22 13:11:37 maxv Exp $	*/
 /*
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
  * 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
 @@ -27,27 +27,27 @@
  * 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>
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.81 2005/08/10 16:22:29 sam Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.114 2018/06/26 06:48:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.115 2018/12/22 13:11:37 maxv Exp $");
 #endif
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/endian.h>
 #include <sys/kernel.h>
 @@ -986,27 +986,27 @@ ieee80211_decap(struct mbuf *m, int hdrl
 		int off, pktlen;
 		n0 = NULL;
 		np = &n0;
 		off = 0;
 		pktlen = m->m_pkthdr.len;
 		while (pktlen > off) {
 			if (n0 == NULL) {
 				MGETHDR(n, M_DONTWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m);
 					return NULL;
+				}
-				M_MOVE_PKTHDR(n, m);
+				m_move_pkthdr(n, m);
 				n->m_len = MHLEN;
 			} else {
 				MGET(n, M_DONTWAIT, MT_DATA);
 				if (n == NULL) {
 					m_freem(m);
 					m_freem(n0);
 					return NULL;
+				}
 				n->m_len = MLEN;
+			}
 			if (pktlen - off >= MINCLSIZE) {
 				MCLGET(n, M_DONTWAIT);
 				if (n->m_flags & M_EXT)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ieee80211_output.c,v 1.63 2018/05/08 07:02:07 maxv Exp $	*/
+/*	$NetBSD: ieee80211_output.c,v 1.64 2018/12/22 13:11:37 maxv Exp $	*/
 /*
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
  * 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
 @@ -27,27 +27,27 @@
  * 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>
 #ifdef __FreeBSD__
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_output.c,v 1.34 2005/08/10 16:22:29 sam Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_output.c,v 1.63 2018/05/08 07:02:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_output.c,v 1.64 2018/12/22 13:11:37 maxv Exp $");
 #endif
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
 @@ -434,27 +434,27 @@ ieee80211_mbuf_adjust(struct ieee80211co
 			m_freem(m);
 			return NULL;
+		}
 		IASSERT(needed_space <= MHLEN,
 		    ("not enough room, need %u got %zu\n", needed_space, MHLEN));
 		/*
 		 * Setup new mbuf to have leading space to prepend the
 		 * 802.11 header and any crypto header bits that are
 		 * required (the latter are added when the driver calls
 		 * back to ieee80211_crypto_encap to do crypto encapsulation).
 		 */
-		M_MOVE_PKTHDR(n, m);
+		m_move_pkthdr(n, m);
 		n->m_len = 0;
 		n->m_data += needed_space;
 		/*
 		 * Pull up Ethernet header to create the expected layout.
 		 * We could use m_pullup but that's overkill (i.e. we don't
 		 * need the actual data) and it cannot fail so do it inline
 		 * for speed.
 		 */
 		n->m_len += sizeof(struct ether_header);
 		m->m_len -= sizeof(struct ether_header);
 		m->m_data += sizeof(struct ether_header);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_output.c,v 1.308 2018/12/12 01:53:52 rin Exp $	*/
+/*	$NetBSD: ip_output.c,v 1.309 2018/12/22 13:11:38 maxv 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
  *    documentation and/or other materials provided with the distribution.
 @@ -81,27 +81,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: ip_output.c,v 1.308 2018/12/12 01:53:52 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.309 2018/12/22 13:11:38 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_mrouting.h"
 #include "opt_net_mpsafe.h"
 #include "opt_mpls.h"
 #endif
 #include "arp.h"
 #include <sys/param.h>
 #include <sys/kmem.h>
 @@ -989,27 +989,27 @@ ip_insertoptions(struct mbuf *m, struct
 	unsigned optlen;
 	optlen = opt->m_len - sizeof(p->ipopt_dst);
 	KASSERT(optlen % 4 == 0);
 	if (optlen + ntohs(ip->ip_len) > IP_MAXPACKET)
 		return m;		/* XXX should fail */
 	if (!in_nullhost(p->ipopt_dst))
 		ip->ip_dst = p->ipopt_dst;
 	if (M_READONLY(m) || M_LEADINGSPACE(m) < optlen) {
 		MGETHDR(n, M_DONTWAIT, MT_HEADER);
 		if (n == NULL)
 			return m;
 		MCLAIM(n, m->m_owner);
-		M_MOVE_PKTHDR(n, m);
+		m_move_pkthdr(n, m);
 		m->m_len -= sizeof(struct ip);
 		m->m_data += sizeof(struct ip);
 		n->m_next = m;
 		n->m_len = optlen + sizeof(struct ip);
 		n->m_data += max_linkhdr;
 		memcpy(mtod(n, void *), ip, sizeof(struct ip));
 		m = n;
 	} else {
 		m->m_data -= optlen;
 		m->m_len += optlen;
 		memmove(mtod(m, void *), ip, sizeof(struct ip));
+	}
 	m->m_pkthdr.len += optlen;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sctp_indata.c,v 1.7 2018/09/03 16:29:36 riastradh Exp $ */
+/*	$NetBSD: sctp_indata.c,v 1.8 2018/12/22 13:11:38 maxv Exp $ */
 /*	$KAME: sctp_indata.c,v 1.36 2005/03/06 16:04:17 itojun Exp $	*/
 /*
  * Copyright (C) 2002, 2003, 2004 Cisco Systems 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
 @@ -21,27 +21,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 PROJECT 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: sctp_indata.c,v 1.7 2018/09/03 16:29:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_indata.c,v 1.8 2018/12/22 13:11:38 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
 #include "opt_inet.h"
 #include "opt_sctp.h"
 #endif /* _KERNEL_OPT */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 @@ -2540,27 +2540,27 @@ sctp_process_data(struct mbuf **mm, int
 	 */
 	if (m->m_len < (long)MHLEN && m->m_next == NULL) {
 		/* we only handle mbufs that are singletons.. not chains */
 		MGET(m, M_DONTWAIT, MT_DATA);
 		if (m) {
 			/* ok lets see if we can copy the data up */
 			vaddr_t *from, *to;
 			if ((*mm)->m_flags & M_PKTHDR) {
 				/* got to copy the header first */
 #ifdef __APPLE__
 				M_COPY_PKTHDR(m, (*mm));
 #else
-				M_MOVE_PKTHDR(m, (*mm));
+				m_move_pkthdr(m, (*mm));
 #endif
+			}
 			/* get the pointers and copy */
 			to = mtod(m, vaddr_t *);
 			from = mtod((*mm), vaddr_t *);
 			memcpy(to, from, (*mm)->m_len);
 			/* copy the length and free up the old */
 			m->m_len = (*mm)->m_len;
 			sctp_m_freem(*mm);
 			/* sucess, back copy */
 			*mm = m;
 		} else {
 			/* We are in trouble in the mbuf world .. yikes */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: icmp6.c,v 1.240 2018/10/25 02:40:45 ozaki-r Exp $	*/
+/*	$NetBSD: icmp6.c,v 1.241 2018/12/22 13:11:38 maxv Exp $	*/
 /*	$KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei 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_icmp.c	8.2 (Berkeley) 1/4/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.240 2018/10/25 02:40:45 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.241 2018/12/22 13:11:38 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 @@ -1397,27 +1397,27 @@ ni6_input(struct mbuf *m, int off)
 		 */
 		qtype = NI_QTYPE_FQDN;
 		/* will append an mbuf */
 		replylen += offsetof(struct ni_reply_fqdn, ni_fqdn_namelen);
 		oldfqdn++;
 		break;
+	}
 	/* allocate an mbuf to reply. */
 	MGETHDR(n, M_DONTWAIT, m->m_type);
 	if (n == NULL) {
 		goto bad;
+	}
-	M_MOVE_PKTHDR(n, m);
+	m_move_pkthdr(n, m);
 	if (replylen > MHLEN) {
 		if (replylen > MCLBYTES) {
 			/*
 			 * XXX: should we try to allocate more? But MCLBYTES
 			 * is probably much larger than IPV6_MMTU...
 			 */
 			goto bad;
+		}
 		MCLGET(n, M_DONTWAIT);
 		if ((n->m_flags & M_EXT) == 0) {
 			goto bad;
+		}
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip6_output.c,v 1.214 2018/12/12 01:53:52 rin Exp $	*/
+/*	$NetBSD: ip6_output.c,v 1.215 2018/12/22 13:11:38 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.214 2018/12/12 01:53:52 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.215 2018/12/22 13:11:38 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>
 @@ -3250,27 +3250,27 @@ ip6_mloopback(struct ifnet *ifp, struct
 static int
 ip6_splithdr(struct mbuf *m, struct ip6_exthdrs *exthdrs)
+{
 	struct mbuf *mh;
 	struct ip6_hdr *ip6;
 	ip6 = mtod(m, struct ip6_hdr *);
 	if (m->m_len > sizeof(*ip6)) {
 		MGETHDR(mh, M_DONTWAIT, MT_HEADER);
 		if (mh == NULL) {
 			m_freem(m);
 			return ENOBUFS;
+		}
-		M_MOVE_PKTHDR(mh, m);
+		m_move_pkthdr(mh, m);
 		MH_ALIGN(mh, sizeof(*ip6));
 		m->m_len -= sizeof(*ip6);
 		m->m_data += sizeof(*ip6);
 		mh->m_next = m;
 		mh->m_len = sizeof(*ip6);
 		memcpy(mtod(mh, void *), (void *)ip6, sizeof(*ip6));
 		m = mh;
+	}
 	exthdrs->ip6e_ip6 = m;
 	return 0;
+}
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ipsec_mbuf.c,v 1.29 2018/09/03 16:29:36 riastradh Exp $	*/
+/*	$NetBSD: ipsec_mbuf.c,v 1.30 2018/12/22 13:11:38 maxv Exp $	*/
 /*
  * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
  * 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.
 @@ -19,27 +19,27 @@
  * 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.
+ *
  * $FreeBSD: sys/netipsec/ipsec_mbuf.c,v 1.5.2.2 2003/03/28 20:32:53 sam Exp $
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_mbuf.c,v 1.29 2018/09/03 16:29:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_mbuf.c,v 1.30 2018/12/22 13:11:38 maxv Exp $");
 /*
  * IPsec-specific mbuf routines.
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <netipsec/ipsec.h>
 #include <netipsec/ipsec_var.h>
 #include <netipsec/ipsec_private.h>
 @@ -106,27 +106,27 @@ m_clone(struct mbuf *m0)
 			IPSEC_STATINC(IPSEC_STAT_CLCOALESCED);
 			continue;
+		}
 		/*
 		 * Allocate new space to hold the copy...
 		 */
 		if (mprev == NULL && (m->m_flags & M_PKTHDR)) {
 			MGETHDR(n, M_DONTWAIT, m->m_type);
 			if (n == NULL) {
 				m_freem(m0);
 				return NULL;
+			}
-			M_MOVE_PKTHDR(n, m);
+			m_move_pkthdr(n, m);
 			MCLGET(n, M_DONTWAIT);
 			if ((n->m_flags & M_EXT) == 0) {
 				m_free(n);
 				m_freem(m0);
 				return NULL;
+			}
 		} else {
 			n = m_getcl(M_DONTWAIT, m->m_type, m->m_flags);
 			if (n == NULL) {
 				m_freem(m0);
 				return NULL;
+			}
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nfs_subs.c,v 1.233 2018/09/03 16:29:36 riastradh Exp $	*/
+/*	$NetBSD: nfs_subs.c,v 1.234 2018/12/22 13:11:38 maxv Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
+ *
  * 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.
 @@ -60,27 +60,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 WASABI SYSTEMS, INC
  * 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: nfs_subs.c,v 1.233 2018/09/03 16:29:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.234 2018/12/22 13:11:38 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
 #endif
 /*
  * These functions support the macros and help fiddle mbuf chains for
  * the nfs op functions. They do things like create the rpc header and
  * copy data between mbuf chains and uio lists.
  */
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 @@ -932,27 +932,27 @@ nfsm_disct(struct mbuf **mdp, char **dpo
 			*cp2 = mtod(m1, char *) + m1->m_len;
 		} else if (havebuf) {
 			/*
 			 * If the first mbuf has a external data
 			 * and there is no previous empty mbuf
 			 * allocate a new mbuf and move the external
 			 * data to the new mbuf. Also make the first
 			 * mbuf look empty.
 			 */
 			m2 = m1;
 			*mdp = m1 = m_get(M_WAIT, MT_DATA);
 			MCLAIM(m1, m2->m_owner);
 			if ((m2->m_flags & M_PKTHDR) != 0) {
-				M_MOVE_PKTHDR(m1, m2);
+				m_move_pkthdr(m1, m2);
+			}
 			if (havebuf) {
 				havebuf->m_next = m1;
+			}
 			m1->m_next = m2;
 			MRESETDATA(m1);
 			m1->m_len = 0;
 			m2->m_data = src;
 			m2->m_len = left;
 			*cp2 = mtod(m1, char *);
 		} else {
 			struct mbuf **nextp = &m1->m_next;