Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Replace M_ALIGN and MH_ALIGN by m_align.
details: https://anonhg.NetBSD.org/src/rev/18c5f4e8a6bd
branches: trunk
changeset: 446848:18c5f4e8a6bd
user: maxv <maxv%NetBSD.org@localhost>
date: Sat Dec 22 14:28:56 2018 +0000
description:
Replace M_ALIGN and MH_ALIGN by m_align.
diffstat:
sys/arch/powerpc/booke/dev/pq3etsec.c | 6 +++---
sys/dev/kttcp.c | 6 +++---
sys/dev/pci/cxgb/cxgb_l2t.c | 4 ++--
sys/dev/pci/cxgb/cxgb_sge.c | 4 ++--
sys/dist/pf/net/if_pfsync.c | 6 +++---
sys/kern/uipc_mbuf.c | 10 +++++-----
sys/kern/uipc_socket.c | 6 +++---
sys/net/if_ieee1394subr.c | 6 +++---
sys/net/if_l2tp.c | 6 +++---
sys/net80211/ieee80211_netbsd.c | 6 +++---
sys/netatalk/aarp.c | 8 ++++----
sys/netbt/rfcomm_session.c | 6 +++---
sys/netinet/if_arp.c | 8 ++++----
sys/netinet/ip_carp.c | 8 ++++----
sys/netinet/ip_icmp.c | 6 +++---
sys/netinet/sctp_output.c | 12 ++++--------
sys/netinet6/ip6_output.c | 6 +++---
sys/netinet6/mld6.c | 6 +++---
sys/netinet6/nd6_nbr.c | 8 ++++----
sys/netipsec/key.c | 10 +++++-----
sys/nfs/nfs_subs.c | 8 ++++----
21 files changed, 71 insertions(+), 75 deletions(-)
diffs (truncated from 638 to 300 lines):
diff -r 056dae1412c5 -r 18c5f4e8a6bd sys/arch/powerpc/booke/dev/pq3etsec.c
--- a/sys/arch/powerpc/booke/dev/pq3etsec.c Sat Dec 22 14:07:53 2018 +0000
+++ b/sys/arch/powerpc/booke/dev/pq3etsec.c Sat Dec 22 14:28:56 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3etsec.c,v 1.38 2018/12/22 13:11:37 maxv Exp $ */
+/* $NetBSD: pq3etsec.c,v 1.39 2018/12/22 14:28:56 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.38 2018/12/22 13:11:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.39 2018/12/22 14:28:56 maxv Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -2110,7 +2110,7 @@
m_move_pkthdr(mn, m);
mn->m_next = m;
m = mn;
- MH_ALIGN(m, sizeof(fcb));
+ m_align(m, sizeof(fcb));
m->m_len = sizeof(fcb);
*mp = m;
}
diff -r 056dae1412c5 -r 18c5f4e8a6bd sys/dev/kttcp.c
--- a/sys/dev/kttcp.c Sat Dec 22 14:07:53 2018 +0000
+++ b/sys/dev/kttcp.c Sat Dec 22 14:28:56 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kttcp.c,v 1.41 2018/09/03 16:29:30 riastradh Exp $ */
+/* $NetBSD: kttcp.c,v 1.42 2018/12/22 14:28:56 maxv Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.41 2018/09/03 16:29:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.42 2018/12/22 14:28:56 maxv Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -297,7 +297,7 @@
* for protocol headers in first mbuf.
*/
if (atomic && top == 0 && len < mlen)
- MH_ALIGN(m, len);
+ m_align(m, len);
}
resid -= len;
m->m_len = len;
diff -r 056dae1412c5 -r 18c5f4e8a6bd sys/dev/pci/cxgb/cxgb_l2t.c
--- a/sys/dev/pci/cxgb/cxgb_l2t.c Sat Dec 22 14:07:53 2018 +0000
+++ b/sys/dev/pci/cxgb/cxgb_l2t.c Sat Dec 22 14:28:56 2018 +0000
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxgb_l2t.c,v 1.4 2016/10/11 12:53:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_l2t.c,v 1.5 2018/12/22 14:28:56 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -114,7 +114,7 @@
return (ENOMEM);
}
/*
- * XXX MH_ALIGN
+ * XXX m_align
*/
req = mtod(m, struct cpl_l2t_write_req *);
req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
diff -r 056dae1412c5 -r 18c5f4e8a6bd sys/dev/pci/cxgb/cxgb_sge.c
--- a/sys/dev/pci/cxgb/cxgb_sge.c Sat Dec 22 14:07:53 2018 +0000
+++ b/sys/dev/pci/cxgb/cxgb_sge.c Sat Dec 22 14:28:56 2018 +0000
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxgb_sge.c,v 1.6 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxgb_sge.c,v 1.7 2018/12/22 14:28:56 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -294,7 +294,7 @@
len = G_RSPD_LEN(ntohl(resp->len_cq));
if (m) {
- MH_ALIGN(m, IMMED_PKT_SIZE);
+ m_align(m, IMMED_PKT_SIZE);
memcpy(m->m_data, resp->imm_data, IMMED_PKT_SIZE);
m->m_len = len;
diff -r 056dae1412c5 -r 18c5f4e8a6bd sys/dist/pf/net/if_pfsync.c
--- a/sys/dist/pf/net/if_pfsync.c Sat Dec 22 14:07:53 2018 +0000
+++ b/sys/dist/pf/net/if_pfsync.c Sat Dec 22 14:28:56 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pfsync.c,v 1.18 2018/09/14 05:09:51 maxv Exp $ */
+/* $NetBSD: if_pfsync.c,v 1.19 2018/12/22 14:28:56 maxv Exp $ */
/* $OpenBSD: if_pfsync.c,v 1.83 2007/06/26 14:44:12 mcbride Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.18 2018/09/14 05:09:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.19 2018/12/22 14:28:56 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1089,7 +1089,7 @@
}
m->m_data += (MCLBYTES - len) &~ (sizeof(long) - 1);
} else
- MH_ALIGN(m, len);
+ m_align(m, len);
m_reset_rcvif(m);
m->m_pkthdr.len = m->m_len = sizeof(struct pfsync_header);
diff -r 056dae1412c5 -r 18c5f4e8a6bd sys/kern/uipc_mbuf.c
--- a/sys/kern/uipc_mbuf.c Sat Dec 22 14:07:53 2018 +0000
+++ b/sys/kern/uipc_mbuf.c Sat Dec 22 14:28:56 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.228 2018/12/22 14:07:53 maxv Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.229 2018/12/22 14:28:56 maxv Exp $ */
/*
* Copyright (c) 1999, 2001, 2018 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.228 2018/12/22 14:07:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.229 2018/12/22 14:28:56 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
@@ -646,10 +646,10 @@
if (m->m_flags & M_PKTHDR) {
if (len < MHLEN)
- MH_ALIGN(m, len);
+ m_align(m, len);
} else {
if (len < MLEN)
- M_ALIGN(m, len);
+ m_align(m, len);
}
m->m_len = len;
@@ -1300,7 +1300,7 @@
if (n == NULL)
return NULL;
MCLAIM(n, m->m_owner);
- M_ALIGN(n, remain);
+ m_align(n, remain);
}
extpacket:
diff -r 056dae1412c5 -r 18c5f4e8a6bd sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c Sat Dec 22 14:07:53 2018 +0000
+++ b/sys/kern/uipc_socket.c Sat Dec 22 14:28:56 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.267 2018/11/07 09:58:19 hannken Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.268 2018/12/22 14:28:56 maxv Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.267 2018/11/07 09:58:19 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.268 2018/12/22 14:28:56 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1042,7 +1042,7 @@
* for protocol headers in first mbuf.
*/
if (atomic && top == 0 && len < mlen)
- MH_ALIGN(m, len);
+ m_align(m, len);
}
error = uiomove(mtod(m, void *), (int)len, uio);
have_data:
diff -r 056dae1412c5 -r 18c5f4e8a6bd sys/net/if_ieee1394subr.c
--- a/sys/net/if_ieee1394subr.c Sat Dec 22 14:07:53 2018 +0000
+++ b/sys/net/if_ieee1394subr.c Sat Dec 22 14:28:56 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ieee1394subr.c,v 1.64 2018/11/15 10:23:56 maxv Exp $ */
+/* $NetBSD: if_ieee1394subr.c,v 1.65 2018/12/22 14:28:56 maxv Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.64 2018/11/15 10:23:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.65 2018/12/22 14:28:56 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -289,7 +289,7 @@
if (m == NULL)
goto bad;
m->m_flags |= m0->m_flags & (M_BCAST|M_MCAST); /* copy bcast */
- MH_ALIGN(m, sizeof(struct ieee1394_fraghdr));
+ m_align(m, sizeof(struct ieee1394_fraghdr));
m->m_len = sizeof(struct ieee1394_fraghdr);
ifh = mtod(m, struct ieee1394_fraghdr *);
ifh->ifh_ft_size =
diff -r 056dae1412c5 -r 18c5f4e8a6bd sys/net/if_l2tp.c
--- a/sys/net/if_l2tp.c Sat Dec 22 14:07:53 2018 +0000
+++ b/sys/net/if_l2tp.c Sat Dec 22 14:28:56 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_l2tp.c,v 1.31 2018/12/22 13:11:37 maxv Exp $ */
+/* $NetBSD: if_l2tp.c,v 1.32 2018/12/22 14:28:56 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.31 2018/12/22 13:11:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_l2tp.c,v 1.32 2018/12/22 14:28:56 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -518,7 +518,7 @@
* ^ ^
* m_data 4 byte aligned
*/
- MH_ALIGN(m_head, L2TP_COPY_LENGTH + roundup(pad, 4));
+ m_align(m_head, L2TP_COPY_LENGTH + roundup(pad, 4));
m_head->m_data += pad;
memcpy(mtod(m_head, void *), mtod(m, void *), copy_length);
diff -r 056dae1412c5 -r 18c5f4e8a6bd sys/net80211/ieee80211_netbsd.c
--- a/sys/net80211/ieee80211_netbsd.c Sat Dec 22 14:07:53 2018 +0000
+++ b/sys/net80211/ieee80211_netbsd.c Sat Dec 22 14:28:56 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.c,v 1.33 2018/12/22 13:55:56 maxv Exp $ */
+/* $NetBSD: ieee80211_netbsd.c,v 1.34 2018/12/22 14:28:56 maxv Exp $ */
/*
* Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
@@ -31,7 +31,7 @@
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.8 2005/08/08 18:46:35 sam Exp $");
#else
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_netbsd.c,v 1.33 2018/12/22 13:55:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_netbsd.c,v 1.34 2018/12/22 14:28:56 maxv Exp $");
#endif
/*
@@ -575,7 +575,7 @@
* frames which all fit in MHLEN.
*/
if (m != NULL)
- MH_ALIGN(m, len);
+ m_align(m, len);
} else {
m = m_getcl(M_NOWAIT, MT_HEADER, M_PKTHDR);
}
diff -r 056dae1412c5 -r 18c5f4e8a6bd sys/netatalk/aarp.c
--- a/sys/netatalk/aarp.c Sat Dec 22 14:07:53 2018 +0000
+++ b/sys/netatalk/aarp.c Sat Dec 22 14:28:56 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aarp.c,v 1.42 2018/05/29 16:29:47 maxv Exp $ */
+/* $NetBSD: aarp.c,v 1.43 2018/12/22 14:28:56 maxv Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.42 2018/05/29 16:29:47 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aarp.c,v 1.43 2018/12/22 14:28:56 maxv Exp $");
#include "opt_mbuftrace.h"
#include "opt_atalk.h"
@@ -170,7 +170,7 @@
MCLAIM(m, &aarp_mowner);
m->m_len = sizeof(*ea);
m->m_pkthdr.len = sizeof(*ea);
- MH_ALIGN(m, sizeof(*ea));
+ m_align(m, sizeof(*ea));
ea = mtod(m, struct ether_aarp *);
memset(ea, 0, sizeof(*ea));
@@ -618,7 +618,7 @@
MCLAIM(m, &aarp_mowner);
Home |
Main Index |
Thread Index |
Old Index