Sat Dec 22 13:11:38 2018 UTC ()
Replace: M_MOVE_PKTHDR -> m_move_pkthdr. No functional change, since the
former is a macro to the latter.


(maxv)
diff -r1.15 -r1.16 src/sys/arch/arm/imx/if_enet.c
diff -r1.37 -r1.38 src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -r1.225 -r1.226 src/sys/kern/uipc_mbuf.c
diff -r1.30 -r1.31 src/sys/net/if_l2tp.c
diff -r1.129 -r1.130 src/sys/net/if_sl.c
diff -r1.110 -r1.111 src/sys/net/if_strip.c
diff -r1.114 -r1.115 src/sys/net80211/ieee80211_input.c
diff -r1.63 -r1.64 src/sys/net80211/ieee80211_output.c
diff -r1.308 -r1.309 src/sys/netinet/ip_output.c
diff -r1.7 -r1.8 src/sys/netinet/sctp_indata.c
diff -r1.240 -r1.241 src/sys/netinet6/icmp6.c
diff -r1.214 -r1.215 src/sys/netinet6/ip6_output.c
diff -r1.29 -r1.30 src/sys/netipsec/ipsec_mbuf.c
diff -r1.233 -r1.234 src/sys/nfs/nfs_subs.c
cvs diff -r1.15 -r1.16 src/sys/arch/arm/imx/if_enet.c (expand / switch to context diff)
--- src/sys/arch/arm/imx/if_enet.c 2018/09/03 16:29:23 1.15
+++ src/sys/arch/arm/imx/if_enet.c 2018/12/22 13:11:37 1.16
@@ -1,4 +1,4 @@
-/*	$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>
@@ -31,7 +31,7 @@
  */
 
 #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"
 
@@ -1505,7 +1505,7 @@
 					}
 					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);
@@ -1630,7 +1630,7 @@
 				}
 				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);
cvs diff -r1.37 -r1.38 src/sys/arch/powerpc/booke/dev/pq3etsec.c (expand / switch to context diff)
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c 2018/09/03 16:29:26 1.37
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c 2018/12/22 13:11:37 1.38
@@ -1,4 +1,4 @@
-/*	$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.
@@ -41,7 +41,7 @@
 
 #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>
@@ -2107,7 +2107,7 @@
 			return;
 		}
 
-		M_MOVE_PKTHDR(mn, m);
+		m_move_pkthdr(mn, m);
 		mn->m_next = m;
 		m = mn;
 		MH_ALIGN(m, sizeof(fcb));
cvs diff -r1.225 -r1.226 src/sys/kern/uipc_mbuf.c (expand / switch to context diff)
--- src/sys/kern/uipc_mbuf.c 2018/11/15 10:56:30 1.225
+++ src/sys/kern/uipc_mbuf.c 2018/12/22 13:11:37 1.226
@@ -1,4 +1,4 @@
-/*	$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.
@@ -62,7 +62,7 @@
  */
 
 #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"
@@ -637,7 +637,7 @@
 	}
 
 	if (m->m_flags & M_PKTHDR) {
-		M_MOVE_PKTHDR(mn, m);
+		m_move_pkthdr(mn, m);
 	} else {
 		MCLAIM(mn, m->m_owner);
 	}
@@ -995,7 +995,7 @@
 		}
 		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);
@@ -1216,7 +1216,7 @@
 		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);
@@ -1584,7 +1584,7 @@
 				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)
cvs diff -r1.30 -r1.31 src/sys/net/if_l2tp.c (expand / switch to context diff)
--- src/sys/net/if_l2tp.c 2018/10/19 00:12:56 1.30
+++ src/sys/net/if_l2tp.c 2018/12/22 13:11:37 1.31
@@ -1,4 +1,4 @@
-/*	$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.
@@ -31,7 +31,7 @@
  */
 
 #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"
@@ -506,7 +506,7 @@
 			m_freem(m);
 			return;
 		}
-		M_MOVE_PKTHDR(m_head, m);
+		m_move_pkthdr(m_head, m);
 
 		/*
 		 * m_head should be:
cvs diff -r1.129 -r1.130 src/sys/net/if_sl.c (expand / switch to context diff)
--- src/sys/net/if_sl.c 2018/04/20 09:56:22 1.129
+++ src/sys/net/if_sl.c 2018/12/22 13:11:37 1.130
@@ -1,4 +1,4 @@
-/*	$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
@@ -60,7 +60,7 @@
  */
 
 #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"
@@ -946,7 +946,7 @@
 			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);
cvs diff -r1.110 -r1.111 src/sys/net/Attic/if_strip.c (expand / switch to context diff)
--- src/sys/net/Attic/if_strip.c 2018/06/06 01:49:09 1.110
+++ src/sys/net/Attic/if_strip.c 2018/12/22 13:11:37 1.111
@@ -1,4 +1,4 @@
-/*	$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 $	*/
 
 /*
@@ -87,7 +87,7 @@
  */
 
 #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"
@@ -1238,7 +1238,7 @@
 			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);
cvs diff -r1.114 -r1.115 src/sys/net80211/ieee80211_input.c (expand / switch to context diff)
--- src/sys/net80211/ieee80211_input.c 2018/06/26 06:48:03 1.114
+++ src/sys/net80211/ieee80211_input.c 2018/12/22 13:11:37 1.115
@@ -1,4 +1,4 @@
-/*	$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
@@ -37,7 +37,7 @@
 __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
@@ -996,7 +996,7 @@
 					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);
cvs diff -r1.63 -r1.64 src/sys/net80211/ieee80211_output.c (expand / switch to context diff)
--- src/sys/net80211/ieee80211_output.c 2018/05/08 07:02:07 1.63
+++ src/sys/net80211/ieee80211_output.c 2018/12/22 13:11:37 1.64
@@ -1,4 +1,4 @@
-/*	$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
@@ -37,7 +37,7 @@
 __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
@@ -444,7 +444,7 @@
 		 * 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;
cvs diff -r1.308 -r1.309 src/sys/netinet/ip_output.c (expand / switch to context diff)
--- src/sys/netinet/ip_output.c 2018/12/12 01:53:52 1.308
+++ src/sys/netinet/ip_output.c 2018/12/22 13:11:38 1.309
@@ -1,4 +1,4 @@
-/*	$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.
@@ -91,7 +91,7 @@
  */
 
 #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"
@@ -999,7 +999,7 @@
 		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;
cvs diff -r1.7 -r1.8 src/sys/netinet/sctp_indata.c (expand / switch to context diff)
--- src/sys/netinet/sctp_indata.c 2018/09/03 16:29:36 1.7
+++ src/sys/netinet/sctp_indata.c 2018/12/22 13:11:38 1.8
@@ -1,4 +1,4 @@
-/*	$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 $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #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"
@@ -2550,7 +2550,7 @@
 #ifdef __APPLE__
 				M_COPY_PKTHDR(m, (*mm));
 #else
-				M_MOVE_PKTHDR(m, (*mm));
+				m_move_pkthdr(m, (*mm));
 #endif
 			}
 			/* get the pointers and copy */
cvs diff -r1.240 -r1.241 src/sys/netinet6/icmp6.c (expand / switch to context diff)
--- src/sys/netinet6/icmp6.c 2018/10/25 02:40:45 1.240
+++ src/sys/netinet6/icmp6.c 2018/12/22 13:11:38 1.241
@@ -1,4 +1,4 @@
-/*	$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 $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #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"
@@ -1407,7 +1407,7 @@
 	if (n == NULL) {
 		goto bad;
 	}
-	M_MOVE_PKTHDR(n, m);
+	m_move_pkthdr(n, m);
 	if (replylen > MHLEN) {
 		if (replylen > MCLBYTES) {
 			/*
cvs diff -r1.214 -r1.215 src/sys/netinet6/ip6_output.c (expand / switch to context diff)
--- src/sys/netinet6/ip6_output.c 2018/12/12 01:53:52 1.214
+++ src/sys/netinet6/ip6_output.c 2018/12/22 13:11:38 1.215
@@ -1,4 +1,4 @@
-/*	$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 $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #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"
@@ -3260,7 +3260,7 @@
 			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);
cvs diff -r1.29 -r1.30 src/sys/netipsec/ipsec_mbuf.c (expand / switch to context diff)
--- src/sys/netipsec/ipsec_mbuf.c 2018/09/03 16:29:36 1.29
+++ src/sys/netipsec/ipsec_mbuf.c 2018/12/22 13:11:38 1.30
@@ -1,4 +1,4 @@
-/*	$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
@@ -29,7 +29,7 @@
  */
 
 #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.
@@ -116,7 +116,7 @@
 				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);
cvs diff -r1.233 -r1.234 src/sys/nfs/nfs_subs.c (expand / switch to context diff)
--- src/sys/nfs/nfs_subs.c 2018/09/03 16:29:36 1.233
+++ src/sys/nfs/nfs_subs.c 2018/12/22 13:11:38 1.234
@@ -1,4 +1,4 @@
-/*	$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
@@ -70,7 +70,7 @@
  */
 
 #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"
@@ -942,7 +942,7 @@
 			*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;