 @@ -1,22 +1,22 @@
-/*	$NetBSD: uipc_mbuf.c,v 1.226 2018/12/22 13:11:37 maxv Exp $	*/
+/*	$NetBSD: uipc_mbuf.c,v 1.227 2018/12/22 13:55:56 maxv Exp $	*/
 /*
- * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
+ * Copyright (c) 1999, 2001, 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
+ * NASA Ames Research Center, and Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 @@ -52,27 +52,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)uipc_mbuf.c	8.4 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.226 2018/12/22 13:11:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.227 2018/12/22 13:55:56 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_mbuftrace.h"
 #include "opt_nmbclusters.h"
 #include "opt_ddb.h"
 #include "ether.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/proc.h>
 @@ -1744,26 +1744,50 @@ m_move_pkthdr(struct mbuf *to, struct mb
 	KASSERT((to->m_flags & M_EXT) == 0);
 	KASSERT((to->m_flags & M_PKTHDR) == 0 ||
 	    SLIST_FIRST(&to->m_pkthdr.tags) == NULL);
 	KASSERT((from->m_flags & M_PKTHDR) != 0);
 	to->m_pkthdr = from->m_pkthdr;
 	to->m_flags = from->m_flags & M_COPYFLAGS;
 	to->m_data = to->m_pktdat;
 	from->m_flags &= ~M_PKTHDR;
+}
 /*
  * Set the m_data pointer of a newly-allocated mbuf to place an object of the
  * specified size at the end of the mbuf, longword aligned.
  */
 void
 m_align(struct mbuf *m, int len)
+{
 	int buflen, adjust;
 	KASSERT(len != M_COPYALL);
 	KASSERT(M_LEADINGSPACE(m) == 0);
 	if (m->m_flags & M_EXT)
 		buflen = m->m_ext.ext_size;
 	else if (m->m_flags & M_PKTHDR)
 		buflen = MHLEN;
 	else
 		buflen = MLEN;
 	KASSERT(len <= buflen);
 	adjust = buflen - len;
 	m->m_data += adjust &~ (sizeof(long)-1);
+}
 /*
  * Apply function f to the data in an mbuf chain starting "off" bytes from the
  * beginning, continuing for "len" bytes.
  */
 int
 m_apply(struct mbuf *m, int off, int len,
     int (*f)(void *, void *, unsigned int), void *arg)
+{
 	unsigned int count;
 	int rval;
 	KASSERT(len != M_COPYALL);
 	KASSERT(len >= 0);
 	KASSERT(off >= 0);

 @@ -1,14 +1,14 @@
-/* $NetBSD: ieee80211_netbsd.c,v 1.32 2018/09/03 16:29:36 riastradh Exp $ */
+/* $NetBSD: ieee80211_netbsd.c,v 1.33 2018/12/22 13:55:56 maxv Exp $ */
 /*
  * Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #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.32 2018/09/03 16:29:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_netbsd.c,v 1.33 2018/12/22 13:55:56 maxv Exp $");
 #endif
 /*
  * IEEE 802.11 support (NetBSD-specific code)
  */
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/once.h>
 @@ -714,47 +714,26 @@ ieee80211_load_module(const char *modnam
 	if (suser(td) == 0 && securelevel_gt(td->td_ucred, 0) == 0) {
 		mtx_lock(&Giant);
 		(void) linker_load_module(modname, NULL, NULL, NULL, NULL);
 		mtx_unlock(&Giant);
+	}
 #else
 	printf("%s: load the %s module by hand for now.\n", __func__, modname);
 #endif
+}
 /* -------------------------------------------------------------------------- */
 /*
  * Set the m_data pointer of a newly-allocated mbuf
  * to place an object of the specified size at the
  * end of the mbuf, longword aligned.
  */
 void
 m_align(struct mbuf *m, int len)
 	int adjust;
 	KASSERT(len != M_COPYALL);
 	if (m->m_flags & M_EXT)
 		adjust = m->m_ext.ext_size - len;
 	else if (m->m_flags & M_PKTHDR)
 		adjust = MHLEN - len;
 	else
 		adjust = MLEN - len;
 	m->m_data += adjust &~ (sizeof(long)-1);
 /*
  * Append the specified data to the indicated mbuf chain,
  * Extend the mbuf chain if the new data does not fit in
  * existing space.
+ *
  * Return 1 if able to complete the job; otherwise 0.
  */
 int
 m_append(struct mbuf *m0, int len, const void *cpv)
+{
 	struct mbuf *m, *n;
 	int remainder, space;
 	const char *cp = cpv;

 @@ -1,14 +1,14 @@
-/* $NetBSD: ieee80211_netbsd.h,v 1.21 2018/05/03 17:14:37 maxv Exp $ */
+/* $NetBSD: ieee80211_netbsd.h,v 1.22 2018/12/22 13:55:56 maxv Exp $ */
 /*-
  * Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -238,17 +238,16 @@ void	get_random_bytes(void *, size_t);
 void	ieee80211_sysctl_attach(struct ieee80211com *);
 void	ieee80211_sysctl_detach(struct ieee80211com *);
 void	ieee80211_load_module(const char *);
 void	ieee80211_rssadapt_sysctl_setup(struct sysctllog **);
 void	ieee80211_init(void);
 #define	IEEE80211_CRYPTO_SETUP(name)				\
 	static void name(void);					\
 	__link_set_add_text(ieee80211_funcs, name);		\
 	static void name(void)
 #endif
 void	m_align(struct mbuf *, int);
 int	m_append(struct mbuf *, int, const void *);
 #endif /* !_NET80211_IEEE80211_NETBSD_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mbuf.h,v 1.215 2018/11/15 11:18:33 maxv Exp $	*/
+/*	$NetBSD: mbuf.h,v 1.216 2018/12/22 13:55:56 maxv Exp $	*/
 /*
  * Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -507,48 +507,28 @@ do {									\
 #define	MRESETDATA(m)							\
 do {									\
 	if ((m)->m_flags & M_EXT)					\
 		(m)->m_data = (m)->m_ext.ext_buf;			\
 	else if ((m)->m_flags & M_PKTHDR)				\
 		(m)->m_data = (m)->m_pktdat;				\
 	else								\
 		(m)->m_data = (m)->m_dat;				\
 } while (/* CONSTCOND */ 0)
 #define	M_COPY_PKTHDR(to, from)	m_copy_pkthdr(to, from)
 #define	M_MOVE_PKTHDR(to, from)	m_move_pkthdr(to, from)
-/*
+#define M_ALIGN(m, len)		m_align(m, len)
- * Set the m_data pointer of a newly-allocated mbuf (m_get/MGET) to place
+#define MH_ALIGN(m, len)	m_align(m, len)
  * an object of the specified size at the end of the mbuf, longword aligned.
  */
 #define	M_ALIGN(m, len)							\
 do {									\
 	KASSERT(((m)->m_flags & (M_PKTHDR|M_EXT)) == 0);		\
 	KASSERT(M_LEADINGSPACE(m) == 0);				\
 	(m)->m_data += (MLEN - (len)) &~ (sizeof(long) - 1);		\
 } while (/* CONSTCOND */ 0)
 /*
  * As above, for mbufs allocated with m_gethdr/MGETHDR
  * or initialized by M_COPY_PKTHDR.
  */
 #define	MH_ALIGN(m, len)						\
 do {									\
 	KASSERT(((m)->m_flags & M_PKTHDR) != 0);			\
 	KASSERT(((m)->m_flags & M_EXT) == 0);				\
 	KASSERT(M_LEADINGSPACE(m) == 0);				\
 	(m)->m_data += (MHLEN - (len)) &~ (sizeof(long) - 1);		\
 } while (/* CONSTCOND */ 0)
 /*
  * Determine if an mbuf's data area is read-only.  This is true
  * if external storage is read-only mapped, or not marked as R/W,
  * or referenced by more than one mbuf.
  */
 #define	M_READONLY(m)							\
 	(((m)->m_flags & M_EXT) != 0 &&					\
 	  (((m)->m_flags & (M_EXT_ROMAP|M_EXT_RW)) != M_EXT_RW ||	\
 	  (m)->m_ext.ext_refcnt > 1))
 #define	M_UNWRITABLE(__m, __len)					\
 	((__m)->m_len < (__len) || M_READONLY((__m)))
 @@ -791,26 +771,27 @@ void	m_cat(struct mbuf *,struct mbuf *);
 void	m_clget(struct mbuf *, int);
 void	m_copyback(struct mbuf *, int, int, const void *);
 struct	mbuf *m_copyback_cow(struct mbuf *, int, int, const void *, int);
 int	m_makewritable(struct mbuf **, int, int, int);
 struct	mbuf *m_getcl(int, int, int);
 void	m_copydata(struct mbuf *, int, int, void *);
 void	m_verify_packet(struct mbuf *);
 struct	mbuf *m_free(struct mbuf *);
 void	m_freem(struct mbuf *);
 void	mbinit(void);
 void	m_remove_pkthdr(struct mbuf *);
 void	m_copy_pkthdr(struct mbuf *, struct mbuf *);
 void	m_move_pkthdr(struct mbuf *, struct mbuf *);
 void	m_align(struct mbuf *, int);
 bool	m_ensure_contig(struct mbuf **, int);
 struct mbuf *m_add(struct mbuf *, struct mbuf *);
 /* Inline routines. */
 static __inline u_int m_length(const struct mbuf *) __unused;
 /* Statistics */
 void mbstat_type_add(int, int);
 /* Packet tag routines */
 struct	m_tag *m_tag_get(int, int, int);
 void	m_tag_free(struct m_tag *);