Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Replace: M_MOVE_PKTHDR -> m_move_pkthdr. No functional c...
details: https://anonhg.NetBSD.org/src/rev/60e373c9a428
branches: trunk
changeset: 837809:60e373c9a428
user: maxv <maxv%NetBSD.org@localhost>
date: Sat Dec 22 13:11:37 2018 +0000
description:
Replace: M_MOVE_PKTHDR -> m_move_pkthdr. No functional change, since the
former is a macro to the latter.
diffstat:
sys/arch/arm/imx/if_enet.c | 8 ++++----
sys/arch/powerpc/booke/dev/pq3etsec.c | 6 +++---
sys/kern/uipc_mbuf.c | 12 ++++++------
sys/net/if_l2tp.c | 6 +++---
sys/net/if_sl.c | 6 +++---
sys/net/if_strip.c | 6 +++---
sys/net80211/ieee80211_input.c | 6 +++---
sys/net80211/ieee80211_output.c | 6 +++---
sys/netinet/ip_output.c | 6 +++---
sys/netinet/sctp_indata.c | 6 +++---
sys/netinet6/icmp6.c | 6 +++---
sys/netinet6/ip6_output.c | 6 +++---
sys/netipsec/ipsec_mbuf.c | 6 +++---
sys/nfs/nfs_subs.c | 6 +++---
14 files changed, 46 insertions(+), 46 deletions(-)
diffs (truncated from 414 to 300 lines):
diff -r 6335e4d54caa -r 60e373c9a428 sys/arch/arm/imx/if_enet.c
--- a/sys/arch/arm/imx/if_enet.c Sat Dec 22 10:00:39 2018 +0000
+++ b/sys/arch/arm/imx/if_enet.c Sat Dec 22 13:11:37 2018 +0000
@@ -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@localhost>
@@ -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);
diff -r 6335e4d54caa -r 60e373c9a428 sys/arch/powerpc/booke/dev/pq3etsec.c
--- a/sys/arch/powerpc/booke/dev/pq3etsec.c Sat Dec 22 10:00:39 2018 +0000
+++ b/sys/arch/powerpc/booke/dev/pq3etsec.c Sat Dec 22 13:11:37 2018 +0000
@@ -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));
diff -r 6335e4d54caa -r 60e373c9a428 sys/kern/uipc_mbuf.c
--- a/sys/kern/uipc_mbuf.c Sat Dec 22 10:00:39 2018 +0000
+++ b/sys/kern/uipc_mbuf.c Sat Dec 22 13:11:37 2018 +0000
@@ -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)
diff -r 6335e4d54caa -r 60e373c9a428 sys/net/if_l2tp.c
--- a/sys/net/if_l2tp.c Sat Dec 22 10:00:39 2018 +0000
+++ b/sys/net/if_l2tp.c Sat Dec 22 13:11:37 2018 +0000
@@ -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:
diff -r 6335e4d54caa -r 60e373c9a428 sys/net/if_sl.c
--- a/sys/net/if_sl.c Sat Dec 22 10:00:39 2018 +0000
+++ b/sys/net/if_sl.c Sat Dec 22 13:11:37 2018 +0000
@@ -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);
diff -r 6335e4d54caa -r 60e373c9a428 sys/net/if_strip.c
--- a/sys/net/if_strip.c Sat Dec 22 10:00:39 2018 +0000
+++ b/sys/net/if_strip.c Sat Dec 22 13:11:37 2018 +0000
@@ -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);
diff -r 6335e4d54caa -r 60e373c9a428 sys/net80211/ieee80211_input.c
--- a/sys/net80211/ieee80211_input.c Sat Dec 22 10:00:39 2018 +0000
+++ b/sys/net80211/ieee80211_input.c Sat Dec 22 13:11:37 2018 +0000
@@ -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);
diff -r 6335e4d54caa -r 60e373c9a428 sys/net80211/ieee80211_output.c
--- a/sys/net80211/ieee80211_output.c Sat Dec 22 10:00:39 2018 +0000
+++ b/sys/net80211/ieee80211_output.c Sat Dec 22 13:11:37 2018 +0000
@@ -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;
diff -r 6335e4d54caa -r 60e373c9a428 sys/netinet/ip_output.c
--- a/sys/netinet/ip_output.c Sat Dec 22 10:00:39 2018 +0000
+++ b/sys/netinet/ip_output.c Sat Dec 22 13:11:37 2018 +0000
@@ -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;
diff -r 6335e4d54caa -r 60e373c9a428 sys/netinet/sctp_indata.c
--- a/sys/netinet/sctp_indata.c Sat Dec 22 10:00:39 2018 +0000
+++ b/sys/netinet/sctp_indata.c Sat Dec 22 13:11:37 2018 +0000
@@ -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));
Home |
Main Index |
Thread Index |
Old Index