diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2018-11-30 09:23:32 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2018-11-30 09:23:32 +0000 |
| commit | 993f15fc4c736f3750f6f3e095613f03805f6431 (patch) | |
| tree | 37473a2870b69163356ea026824b0f72a8f8601c /sys/kern | |
| parent | 66d2d26ef6eb9a6231fc8c5af24902b922570b04 (diff) | |
Trivial MH_ALIGN/M_ALIGN to m_align conversions.
OK bluhm@
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 10 | ||||
| -rw-r--r-- | sys/kern/uipc_socket.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 22e131c9711..2601e292702 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf.c,v 1.261 2018/11/12 07:45:52 claudio Exp $ */ +/* $OpenBSD: uipc_mbuf.c,v 1.262 2018/11/30 09:23:31 claudio Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */ /* @@ -618,7 +618,7 @@ m_prepend(struct mbuf *m, int len, int how) M_MOVE_PKTHDR(mn, m); mn->m_next = m; m = mn; - MH_ALIGN(m, len); + m_align(m, len); m->m_len = len; } if (m->m_flags & M_PKTHDR) @@ -1057,7 +1057,7 @@ m_split(struct mbuf *m0, int len0, int wait) goto extpacket; if (remain > MHLEN) { /* m can't be the lead packet */ - MH_ALIGN(n, 0); + m_align(n, 0); n->m_next = m_split(m, len, wait); if (n->m_next == NULL) { (void) m_free(n); @@ -1068,7 +1068,7 @@ m_split(struct mbuf *m0, int len0, int wait) return (n); } } else - MH_ALIGN(n, remain); + m_align(n, remain); } else if (remain == 0) { n = m->m_next; m->m_next = NULL; @@ -1077,7 +1077,7 @@ m_split(struct mbuf *m0, int len0, int wait) MGET(n, wait, m->m_type); if (n == NULL) return (NULL); - M_ALIGN(n, remain); + m_align(n, remain); } extpacket: if (m->m_flags & M_EXT) { diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 9ba5b442e77..c9bde9be5f0 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.229 2018/11/21 16:50:49 claudio Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.230 2018/11/30 09:23:31 claudio Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -577,7 +577,7 @@ nopages: * for protocol headers in first mbuf. */ if (atomic && m == top && len < mlen - max_hdr) - MH_ALIGN(m, len); + m_align(m, len); } error = uiomove(mtod(m, caddr_t), len, uio); |