Module Name: src
Committed By: maxv
Date: Sat Dec 22 14:28:57 UTC 2018
Modified Files:
src/sys/arch/powerpc/booke/dev: pq3etsec.c
src/sys/dev: kttcp.c
src/sys/dev/pci/cxgb: cxgb_l2t.c cxgb_sge.c
src/sys/dist/pf/net: if_pfsync.c
src/sys/kern: uipc_mbuf.c uipc_socket.c
src/sys/net: if_ieee1394subr.c if_l2tp.c
src/sys/net80211: ieee80211_netbsd.c
src/sys/netatalk: aarp.c
src/sys/netbt: rfcomm_session.c
src/sys/netinet: if_arp.c ip_carp.c ip_icmp.c sctp_output.c
src/sys/netinet6: ip6_output.c mld6.c nd6_nbr.c
src/sys/netipsec: key.c
src/sys/nfs: nfs_subs.c
Log Message:
Replace M_ALIGN and MH_ALIGN by m_align.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/kttcp.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/cxgb/cxgb_l2t.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/cxgb/cxgb_sge.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dist/pf/net/if_pfsync.c
cvs rdiff -u -r1.228 -r1.229 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.267 -r1.268 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.64 -r1.65 src/sys/net/if_ieee1394subr.c
cvs rdiff -u -r1.31 -r1.32 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.33 -r1.34 src/sys/net80211/ieee80211_netbsd.c
cvs rdiff -u -r1.42 -r1.43 src/sys/netatalk/aarp.c
cvs rdiff -u -r1.24 -r1.25 src/sys/netbt/rfcomm_session.c
cvs rdiff -u -r1.277 -r1.278 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.100 -r1.101 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.176 -r1.177 src/sys/netinet/ip_icmp.c
cvs rdiff -u -r1.17 -r1.18 src/sys/netinet/sctp_output.c
cvs rdiff -u -r1.215 -r1.216 src/sys/netinet6/ip6_output.c
cvs rdiff -u -r1.99 -r1.100 src/sys/netinet6/mld6.c
cvs rdiff -u -r1.163 -r1.164 src/sys/netinet6/nd6_nbr.c
cvs rdiff -u -r1.257 -r1.258 src/sys/netipsec/key.c
cvs rdiff -u -r1.234 -r1.235 src/sys/nfs/nfs_subs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.38 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.39
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.38 Sat Dec 22 13:11:37 2018
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c Sat Dec 22 14:28:56 2018
@@ -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 @@ pq3etsec_tx_offload(
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;
}
Index: src/sys/dev/kttcp.c
diff -u src/sys/dev/kttcp.c:1.41 src/sys/dev/kttcp.c:1.42
--- src/sys/dev/kttcp.c:1.41 Mon Sep 3 16:29:30 2018
+++ src/sys/dev/kttcp.c Sat Dec 22 14:28:56 2018
@@ -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 @@ nopages:
* 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;
Index: src/sys/dev/pci/cxgb/cxgb_l2t.c
diff -u src/sys/dev/pci/cxgb/cxgb_l2t.c:1.4 src/sys/dev/pci/cxgb/cxgb_l2t.c:1.5
--- src/sys/dev/pci/cxgb/cxgb_l2t.c:1.4 Tue Oct 11 12:53:56 2016
+++ src/sys/dev/pci/cxgb/cxgb_l2t.c Sat Dec 22 14:28:56 2018
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
#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 @@ setup_l2e_send_pending(struct toedev *de
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));
Index: src/sys/dev/pci/cxgb/cxgb_sge.c
diff -u src/sys/dev/pci/cxgb/cxgb_sge.c:1.6 src/sys/dev/pci/cxgb/cxgb_sge.c:1.7
--- src/sys/dev/pci/cxgb/cxgb_sge.c:1.6 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/cxgb/cxgb_sge.c Sat Dec 22 14:28:56 2018
@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
#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 @@ get_imm_packet(adapter_t *sc, const stru
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;
Index: src/sys/dist/pf/net/if_pfsync.c
diff -u src/sys/dist/pf/net/if_pfsync.c:1.18 src/sys/dist/pf/net/if_pfsync.c:1.19
--- src/sys/dist/pf/net/if_pfsync.c:1.18 Fri Sep 14 05:09:51 2018
+++ src/sys/dist/pf/net/if_pfsync.c Sat Dec 22 14:28:56 2018
@@ -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 @@ pfsync_get_mbuf(struct pfsync_softc *sc,
}
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);
Index: src/sys/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.228 src/sys/kern/uipc_mbuf.c:1.229
--- src/sys/kern/uipc_mbuf.c:1.228 Sat Dec 22 14:07:53 2018
+++ src/sys/kern/uipc_mbuf.c Sat Dec 22 14:28:56 2018
@@ -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 @@ m_prepend(struct mbuf *m, int len, int h
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 @@ m_split_internal(struct mbuf *m0, int le
if (n == NULL)
return NULL;
MCLAIM(n, m->m_owner);
- M_ALIGN(n, remain);
+ m_align(n, remain);
}
extpacket:
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.267 src/sys/kern/uipc_socket.c:1.268
--- src/sys/kern/uipc_socket.c:1.267 Wed Nov 7 09:58:19 2018
+++ src/sys/kern/uipc_socket.c Sat Dec 22 14:28:56 2018
@@ -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 @@ sosend(struct socket *so, struct sockadd
* 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:
Index: src/sys/net/if_ieee1394subr.c
diff -u src/sys/net/if_ieee1394subr.c:1.64 src/sys/net/if_ieee1394subr.c:1.65
--- src/sys/net/if_ieee1394subr.c:1.64 Thu Nov 15 10:23:56 2018
+++ src/sys/net/if_ieee1394subr.c Sat Dec 22 14:28:56 2018
@@ -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 @@ ieee1394_fragment(struct ifnet *ifp, str
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 =
Index: src/sys/net/if_l2tp.c
diff -u src/sys/net/if_l2tp.c:1.31 src/sys/net/if_l2tp.c:1.32
--- src/sys/net/if_l2tp.c:1.31 Sat Dec 22 13:11:37 2018
+++ src/sys/net/if_l2tp.c Sat Dec 22 14:28:56 2018
@@ -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 @@ l2tp_input(struct mbuf *m, struct ifnet
* ^ ^
* 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);
Index: src/sys/net80211/ieee80211_netbsd.c
diff -u src/sys/net80211/ieee80211_netbsd.c:1.33 src/sys/net80211/ieee80211_netbsd.c:1.34
--- src/sys/net80211/ieee80211_netbsd.c:1.33 Sat Dec 22 13:55:56 2018
+++ src/sys/net80211/ieee80211_netbsd.c Sat Dec 22 14:28:56 2018
@@ -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 @@ ieee80211_getmgtframe(u_int8_t **frm, u_
* 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);
}
Index: src/sys/netatalk/aarp.c
diff -u src/sys/netatalk/aarp.c:1.42 src/sys/netatalk/aarp.c:1.43
--- src/sys/netatalk/aarp.c:1.42 Tue May 29 16:29:47 2018
+++ src/sys/netatalk/aarp.c Sat Dec 22 14:28:56 2018
@@ -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 @@ aarpwhohas(struct ifnet *ifp, const stru
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 @@ aarpprobe(void *arp)
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));
Index: src/sys/netbt/rfcomm_session.c
diff -u src/sys/netbt/rfcomm_session.c:1.24 src/sys/netbt/rfcomm_session.c:1.25
--- src/sys/netbt/rfcomm_session.c:1.24 Mon Sep 3 16:29:36 2018
+++ src/sys/netbt/rfcomm_session.c Sat Dec 22 14:28:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rfcomm_session.c,v 1.24 2018/09/03 16:29:36 riastradh Exp $ */
+/* $NetBSD: rfcomm_session.c,v 1.25 2018/12/22 14:28:57 maxv Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rfcomm_session.c,v 1.24 2018/09/03 16:29:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rfcomm_session.c,v 1.25 2018/12/22 14:28:57 maxv Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1564,7 +1564,7 @@ rfcomm_session_send_uih(struct rfcomm_se
if (m0 == NULL)
goto nomem;
- MH_ALIGN(m0, 5); /* (max 5 header octets) */
+ m_align(m0, 5); /* (max 5 header octets) */
hdr = mtod(m0, uint8_t *);
/* CR bit is set according to the initiator of the session */
Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.277 src/sys/netinet/if_arp.c:1.278
--- src/sys/netinet/if_arp.c:1.277 Thu Nov 29 09:51:20 2018
+++ src/sys/netinet/if_arp.c Sat Dec 22 14:28:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.277 2018/11/29 09:51:20 ozaki-r Exp $ */
+/* $NetBSD: if_arp.c,v 1.278 2018/12/22 14:28:57 maxv Exp $ */
/*
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.277 2018/11/29 09:51:20 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.278 2018/12/22 14:28:57 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -660,7 +660,7 @@ arprequest(struct ifnet *ifp,
break;
}
m->m_pkthdr.len = m->m_len;
- MH_ALIGN(m, m->m_len);
+ m_align(m, m->m_len);
ah = mtod(m, struct arphdr *);
memset(ah, 0, m->m_len);
switch (ifp->if_type) {
@@ -1960,7 +1960,7 @@ revarprequest(struct ifnet *ifp)
m->m_len = sizeof(*ah) + 2*sizeof(struct in_addr) +
2*ifp->if_addrlen;
m->m_pkthdr.len = m->m_len;
- MH_ALIGN(m, m->m_len);
+ m_align(m, m->m_len);
ah = mtod(m, struct arphdr *);
memset(ah, 0, m->m_len);
ah->ar_pro = htons(ETHERTYPE_IP);
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.100 src/sys/netinet/ip_carp.c:1.101
--- src/sys/netinet/ip_carp.c:1.100 Fri Sep 14 05:09:51 2018
+++ src/sys/netinet/ip_carp.c Sat Dec 22 14:28:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.100 2018/09/14 05:09:51 maxv Exp $ */
+/* $NetBSD: ip_carp.c,v 1.101 2018/12/22 14:28:57 maxv Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -33,7 +33,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.100 2018/09/14 05:09:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.101 2018/12/22 14:28:57 maxv Exp $");
/*
* TODO:
@@ -1081,7 +1081,7 @@ carp_send_ad(void *v)
m->m_pkthdr.len = len;
m_reset_rcvif(m);
m->m_len = len;
- MH_ALIGN(m, m->m_len);
+ m_align(m, m->m_len);
m->m_flags |= M_MCAST;
ip = mtod(m, struct ip *);
ip->ip_v = IPVERSION;
@@ -1165,7 +1165,7 @@ carp_send_ad(void *v)
m->m_pkthdr.len = len;
m_reset_rcvif(m);
m->m_len = len;
- MH_ALIGN(m, m->m_len);
+ m_align(m, m->m_len);
m->m_flags |= M_MCAST;
ip6 = mtod(m, struct ip6_hdr *);
memset(ip6, 0, sizeof(*ip6));
Index: src/sys/netinet/ip_icmp.c
diff -u src/sys/netinet/ip_icmp.c:1.176 src/sys/netinet/ip_icmp.c:1.177
--- src/sys/netinet/ip_icmp.c:1.176 Thu Nov 15 10:23:56 2018
+++ src/sys/netinet/ip_icmp.c Sat Dec 22 14:28:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_icmp.c,v 1.176 2018/11/15 10:23:56 maxv Exp $ */
+/* $NetBSD: ip_icmp.c,v 1.177 2018/12/22 14:28:57 maxv Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.176 2018/11/15 10:23:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.177 2018/12/22 14:28:57 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -336,7 +336,7 @@ icmp_error(struct mbuf *n, int type, int
ICMP_STATINC(ICMP_STAT_OUTHIST + type);
if ((m->m_flags & M_EXT) == 0)
- MH_ALIGN(m, m->m_len);
+ m_align(m, m->m_len);
/*
* Get pointers on the IP header and the ICMP header.
Index: src/sys/netinet/sctp_output.c
diff -u src/sys/netinet/sctp_output.c:1.17 src/sys/netinet/sctp_output.c:1.18
--- src/sys/netinet/sctp_output.c:1.17 Sun Sep 16 09:25:47 2018
+++ src/sys/netinet/sctp_output.c Sat Dec 22 14:28:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sctp_output.c,v 1.17 2018/09/16 09:25:47 skrll Exp $ */
+/* $NetBSD: sctp_output.c,v 1.18 2018/12/22 14:28:57 maxv Exp $ */
/* $KAME: sctp_output.c,v 1.48 2005/06/16 18:29:24 jinmei Exp $ */
/*
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.17 2018/09/16 09:25:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.18 2018/12/22 14:28:57 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -5874,7 +5874,7 @@ sctp_med_chunk_output(struct sctp_inpcb
* mbuf at the head due to the lack
* of a MHDR at the beginning.
*/
- MH_ALIGN(outchain, sizeof(struct sctphdr));
+ m_align(outchain, sizeof(struct sctphdr));
outchain->m_len = sizeof(struct sctphdr);
} else {
M_PREPEND(outchain, sizeof(struct sctphdr), M_DONTWAIT);
@@ -9248,11 +9248,7 @@ sctp_copy_one(struct mbuf *m, struct uio
while (left > 0) {
/* Align data to the end */
if ((m->m_flags & M_EXT) == 0) {
- if (m->m_flags & M_PKTHDR) {
- MH_ALIGN(m, willcpy);
- } else {
- M_ALIGN(m, willcpy);
- }
+ m_align(m, willcpy);
} else {
MC_ALIGN(m, willcpy);
}
Index: src/sys/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.215 src/sys/netinet6/ip6_output.c:1.216
--- src/sys/netinet6/ip6_output.c:1.215 Sat Dec 22 13:11:38 2018
+++ src/sys/netinet6/ip6_output.c Sat Dec 22 14:28:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.215 2018/12/22 13:11:38 maxv Exp $ */
+/* $NetBSD: ip6_output.c,v 1.216 2018/12/22 14:28:57 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.215 2018/12/22 13:11:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.216 2018/12/22 14:28:57 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -3261,7 +3261,7 @@ ip6_splithdr(struct mbuf *m, struct ip6_
return ENOBUFS;
}
m_move_pkthdr(mh, m);
- MH_ALIGN(mh, sizeof(*ip6));
+ m_align(mh, sizeof(*ip6));
m->m_len -= sizeof(*ip6);
m->m_data += sizeof(*ip6);
mh->m_next = m;
Index: src/sys/netinet6/mld6.c
diff -u src/sys/netinet6/mld6.c:1.99 src/sys/netinet6/mld6.c:1.100
--- src/sys/netinet6/mld6.c:1.99 Tue May 29 04:39:26 2018
+++ src/sys/netinet6/mld6.c Sat Dec 22 14:28:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mld6.c,v 1.99 2018/05/29 04:39:26 ozaki-r Exp $ */
+/* $NetBSD: mld6.c,v 1.100 2018/12/22 14:28:57 maxv Exp $ */
/* $KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $ */
/*
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.99 2018/05/29 04:39:26 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.100 2018/12/22 14:28:57 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -656,7 +656,7 @@ mld_allocbuf(struct mbuf **mh, struct in
m_reset_rcvif((*mh));
(*mh)->m_pkthdr.len = sizeof(struct ip6_hdr) + sizeof(struct mld_hdr);
(*mh)->m_len = sizeof(struct ip6_hdr);
- MH_ALIGN(*mh, sizeof(struct ip6_hdr));
+ m_align(*mh, sizeof(struct ip6_hdr));
/* fill in the ip6 header */
ip6 = mtod(*mh, struct ip6_hdr *);
Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.163 src/sys/netinet6/nd6_nbr.c:1.164
--- src/sys/netinet6/nd6_nbr.c:1.163 Thu Dec 13 10:27:51 2018
+++ src/sys/netinet6/nd6_nbr.c Sat Dec 22 14:28:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_nbr.c,v 1.163 2018/12/13 10:27:51 roy Exp $ */
+/* $NetBSD: nd6_nbr.c,v 1.164 2018/12/22 14:28:57 maxv Exp $ */
/* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.163 2018/12/13 10:27:51 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.164 2018/12/22 14:28:57 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -424,7 +424,7 @@ nd6_ns_output(struct ifnet *ifp, const s
icmp6len = sizeof(*nd_ns);
m->m_pkthdr.len = m->m_len = sizeof(*ip6) + icmp6len;
- m->m_data += max_linkhdr; /* or MH_ALIGN() equivalent? */
+ m->m_data += max_linkhdr; /* or m_align() equivalent? */
/* fill neighbor solicitation packet */
ip6 = mtod(m, struct ip6_hdr *);
@@ -958,7 +958,7 @@ nd6_na_output(
icmp6len = sizeof(*nd_na);
m->m_pkthdr.len = m->m_len = sizeof(struct ip6_hdr) + icmp6len;
- m->m_data += max_linkhdr; /* or MH_ALIGN() equivalent? */
+ m->m_data += max_linkhdr; /* or m_align() equivalent? */
/* fill neighbor advertisement packet */
ip6 = mtod(m, struct ip6_hdr *);
Index: src/sys/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.257 src/sys/netipsec/key.c:1.258
--- src/sys/netipsec/key.c:1.257 Thu Aug 23 01:55:38 2018
+++ src/sys/netipsec/key.c Sat Dec 22 14:28:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.257 2018/08/23 01:55:38 ozaki-r Exp $ */
+/* $NetBSD: key.c,v 1.258 2018/12/22 14:28:57 maxv Exp $ */
/* $FreeBSD: key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.257 2018/08/23 01:55:38 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.258 2018/12/22 14:28:57 maxv Exp $");
/*
* This code is referred to RFC 2367
@@ -6395,7 +6395,7 @@ key_getcomb_esp(int mflag)
"l=%u > MLEN=%lu", l, (u_long) MLEN);
MGET(m, mflag, MT_DATA);
if (m) {
- M_ALIGN(m, l);
+ m_align(m, l);
m->m_len = l;
m->m_next = NULL;
memset(mtod(m, void *), 0, m->m_len);
@@ -6495,7 +6495,7 @@ key_getcomb_ah(int mflag)
"l=%u > MLEN=%lu", l, (u_long) MLEN);
MGET(m, mflag, MT_DATA);
if (m) {
- M_ALIGN(m, l);
+ m_align(m, l);
m->m_len = l;
m->m_next = NULL;
}
@@ -6545,7 +6545,7 @@ key_getcomb_ipcomp(int mflag)
"l=%u > MLEN=%lu", l, (u_long) MLEN);
MGET(m, mflag, MT_DATA);
if (m) {
- M_ALIGN(m, l);
+ m_align(m, l);
m->m_len = l;
m->m_next = NULL;
}
Index: src/sys/nfs/nfs_subs.c
diff -u src/sys/nfs/nfs_subs.c:1.234 src/sys/nfs/nfs_subs.c:1.235
--- src/sys/nfs/nfs_subs.c:1.234 Sat Dec 22 13:11:38 2018
+++ src/sys/nfs/nfs_subs.c Sat Dec 22 14:28:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_subs.c,v 1.234 2018/12/22 13:11:38 maxv Exp $ */
+/* $NetBSD: nfs_subs.c,v 1.235 2018/12/22 14:28:57 maxv Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.234 2018/12/22 13:11:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.235 2018/12/22 14:28:57 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -614,9 +614,9 @@ nfsm_rpchead(kauth_cred_t cr, int nmflag
if ((authsiz + 10 * NFSX_UNSIGNED) >= MINCLSIZE) {
m_clget(mb, M_WAIT);
} else if ((authsiz + 10 * NFSX_UNSIGNED) < MHLEN) {
- MH_ALIGN(mb, authsiz + 10 * NFSX_UNSIGNED);
+ m_align(mb, authsiz + 10 * NFSX_UNSIGNED);
} else {
- MH_ALIGN(mb, 8 * NFSX_UNSIGNED);
+ m_align(mb, 8 * NFSX_UNSIGNED);
}
mb->m_len = 0;
mreq = mb;
