 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_gre.c,v 1.170 2016/08/07 17:38:33 christos Exp $ */
+/*	$NetBSD: if_gre.c,v 1.171 2016/10/02 14:17:07 christos Exp $ */
 /*
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Heiko W.Rupp <hwr@pilhuhn.de>
+ *
  * IPv6-over-GRE contributed by Gert Doering <gert@greenie.muc.de>
+ *
  * GRE over UDP/IPv4/IPv6 sockets contributed by David Young <dyoung@NetBSD.org>
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -35,27 +35,27 @@
  * This material is based upon work partially supported by NSF
  * under Contract No. NSF CNS-0626584.
  */
 /*
  * Encapsulate L3 protocols into IP
  * See RFC 1701 and 1702 for more details.
  * If_gre is compatible with Cisco GRE tunnels, so you can
  * have a NetBSD box as the other end of a tunnel interface of a Cisco
  * router. See gre(4) for more details.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.170 2016/08/07 17:38:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.171 2016/10/02 14:17:07 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_atalk.h"
 #include "opt_gre.h"
 #include "opt_inet.h"
 #include "opt_mpls.h"
 #endif
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/malloc.h>
 #include <sys/mallocvar.h>
 @@ -599,40 +599,38 @@ gre_soreceive(struct socket *so, struct
 	 */
 	if (curlwp != NULL)
 		curlwp->l_ru.ru_msgrcv++;
 	KASSERT(m == so->so_rcv.sb_mb);
 	SBLASTRECORDCHK(&so->so_rcv, "soreceive 1");
 	SBLASTMBUFCHK(&so->so_rcv, "soreceive 1");
 	nextrecord = m->m_nextpkt;
 	if (pr->pr_flags & PR_ADDR) {
 #ifdef DIAGNOSTIC
 		if (m->m_type != MT_SONAME)
 			panic("receive 1a");
 #endif
 		sbfree(&so->so_rcv, m);
-		MFREE(m, so->so_rcv.sb_mb);
+		m = so->so_rcv.sb_mb = m_free(m);
 		m = so->so_rcv.sb_mb;
+	}
 	while (m != NULL && m->m_type == MT_CONTROL && error == 0) {
 		sbfree(&so->so_rcv, m);
 		/*
 		 * Dispose of any SCM_RIGHTS message that went
 		 * through the read path rather than recv.
 		 */
 		if (pr->pr_domain->dom_dispose &&
 		    mtod(m, struct cmsghdr *)->cmsg_type == SCM_RIGHTS)
 			(*pr->pr_domain->dom_dispose)(m);
-		MFREE(m, so->so_rcv.sb_mb);
+		m = so->so_rcv.sb_mb = m_free(m);
 		m = so->so_rcv.sb_mb;
+	}
 	/*
 	 * If m is non-NULL, we have some data to read.  From now on,
 	 * make sure to keep sb_lastrecord consistent when working on
 	 * the last packet on the chain (nextrecord == NULL) and we
 	 * change m->m_nextpkt.
 	 */
 	if (m != NULL) {
 		m->m_nextpkt = nextrecord;
 		/*
 		 * If nextrecord == NULL (this is a single chain),
 		 * then sb_lastrecord may not be valid here if m

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ppp.c,v 1.157 2016/08/07 17:38:34 christos Exp $	*/
+/*	$NetBSD: if_ppp.c,v 1.158 2016/10/02 14:17:07 christos Exp $	*/
 /*	Id: if_ppp.c,v 1.6 1997/03/04 03:33:00 paulus Exp 	*/
 /*
  * if_ppp.c - Point-to-Point Protocol (PPP) Asynchronous driver.
+ *
  * Copyright (c) 1984-2000 Carnegie Mellon University. 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.
 @@ -92,27 +92,27 @@
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 /*
  * XXX IMP ME HARDER
+ *
  * This is an explanation of that comment.  This code used to use
  * splimp() to block both network and tty interrupts.  However,
  * that call is deprecated.  So, we have replaced the uses of
  * splimp() with splhigh() in order to applomplish what it needs
  * to accomplish, and added that happy little comment.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.157 2016/08/07 17:38:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ppp.c,v 1.158 2016/10/02 14:17:07 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "ppp.h"
 #include "opt_inet.h"
 #include "opt_gateway.h"
 #include "opt_ppp.h"
 #endif
 #ifdef INET
 #define VJC
 #endif
 #define PPP_COMPRESS
 @@ -1583,27 +1583,27 @@ ppp_inproc(struct ppp_softc *sc, struct
 		bcopy(iphdr, cp + PPP_HDRLEN, hlen);
 		mp->m_len = hlen + PPP_HDRLEN;
 		/*
 		 * Trim the PPP and VJ headers off the old mbuf
 		 * and stick the new and old mbufs together.
 		 */
 		m->m_data += PPP_HDRLEN + xlen;
 		m->m_len -= PPP_HDRLEN + xlen;
 		if (m->m_len <= M_TRAILINGSPACE(mp)) {
 			bcopy(mtod(m, u_char *),
 			    mtod(mp, u_char *) + mp->m_len, m->m_len);
 			mp->m_len += m->m_len;
-			MFREE(m, mp->m_next);
+			mp->m_next = m_free(m);
 		} else
 			mp->m_next = m;
 		m = mp;
 		ilen += hlen - xlen;
 	} else if (proto == PPP_VJC_UNCOMP) {
 		if ((sc->sc_flags & SC_REJ_COMP_TCP) || sc->sc_comp == 0)
 			goto bad;
 		xlen = sl_uncompress_tcp_core(cp + PPP_HDRLEN,
 		    m->m_len - PPP_HDRLEN, ilen - PPP_HDRLEN,
 		    TYPE_UNCOMPRESSED_TCP, sc->sc_comp, &iphdr, &hlen);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_sl.c,v 1.126 2016/08/07 17:38:34 christos Exp $	*/
+/*	$NetBSD: if_sl.c,v 1.127 2016/10/02 14:17:07 christos Exp $	*/
 /*
  * Copyright (c) 1987, 1989, 1992, 1993
  *	The Regents of the University of California.  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.
 @@ -50,27 +50,27 @@
  * Converted to 4.3BSD Beta by Chris Torek.
  * Other changes made at Berkeley, based in part on code by Kirk Smith.
  * W. Jolitz added slip abort.
+ *
  * Hacked almost beyond recognition by Van Jacobson (van@helios.ee.lbl.gov).
  * Added priority queuing for "interactive" traffic; hooks for TCP
  * header compression; ICMP filtering (at 2400 baud, some cretin
  * pinging you can use up all your bandwidth).  Made low clist behavior
  * more robust and slightly less likely to hang serial line.
  * Sped up a bunch of things.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.126 2016/08/07 17:38:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sl.c,v 1.127 2016/10/02 14:17:07 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/dkstat.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 @@ -836,28 +836,27 @@ slintr(void *arg)
 					if (putc(FRAME_ESCAPE, &tp->t_outq))
 						break;
 					if (putc(*cp++ == FRAME_ESCAPE ?
 					    TRANS_FRAME_ESCAPE :
 					    TRANS_FRAME_END,
 					    &tp->t_outq)) {
 						(void)unputc(&tp->t_outq);
 						break;
+					}
 					sc->sc_if.if_obytes += 2;
+				}
 				bp = cp;
+			}
-			MFREE(m, m2);
+			m = m2 = m_free(m);
 			m = m2;
+		}
 		if (putc(FRAME_END, &tp->t_outq)) {
 			/*
 			 * Not enough room.  Remove a char to make
 			 * room and end the packet normally.  If
 			 * you get many collisions (more than one
 			 * or two a day), you probably do not have
 			 * enough clists and you should increase
 			 * "nclist" in param.c
 			 */
 			(void)unputc(&tp->t_outq);
 			(void)putc(FRAME_END, &tp->t_outq);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_strip.c,v 1.106 2016/08/07 17:38:34 christos Exp $	*/
+/*	$NetBSD: if_strip.c,v 1.107 2016/10/02 14:17:07 christos Exp $	*/
 /*	from: NetBSD: if_sl.c,v 1.38 1996/02/13 22:00:23 christos Exp $	*/
 /*
  * Copyright 1996 The Board of Trustees of The Leland Stanford
  * Junior University. All Rights Reserved.
+ *
  * Permission to use, copy, modify, and distribute this
  * software and its documentation for any purpose and without
  * fee is hereby granted, provided that the above copyright
  * notice appear in all copies.  Stanford University
  * makes no representations about the suitability of this
  * software for any purpose.  It is provided "as is" without
  * express or implied warranty.
 @@ -77,27 +77,27 @@
  * Converted to 4.3BSD Beta by Chris Torek.
  * Other changes made at Berkeley, based in part on code by Kirk Smith.
  * W. Jolitz added slip abort.
+ *
  * Hacked almost beyond recognition by Van Jacobson (van@helios.ee.lbl.gov).
  * Added priority queuing for "interactive" traffic; hooks for TCP
  * header compression; ICMP filtering (at 2400 baud, some cretin
  * pinging you can use up all your bandwidth).  Made low clist behavior
  * more robust and slightly less likely to hang serial line.
  * Sped up a bunch of things.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.106 2016/08/07 17:38:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_strip.c,v 1.107 2016/10/02 14:17:07 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/dkstat.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 @@ -666,28 +666,27 @@ strip_sendbody(struct strip_softc *sc, s
 	while (m) {
 		if (m->m_len != 0) {
 			/*
 			 * Byte-stuff/run-length encode this mbuf's data
 			 * into the output buffer.
 			 * XXX Note that chained calls to stuffdata()
 			 * require that the stuffed data be left in the
 			 * output buffer until the entire packet is encoded.
 			 */
 			dp = StuffData(mtod(m, u_char *), m->m_len, dp,
 			    &rllstate_ptr);
+		}
-		MFREE(m, m2);
+		m = m2 = m_free(m);
 		m = m2;
+	}
 	/*
 	 * Put the entire stuffed packet into the tty output queue.
 	 */
 	len = dp - sc->sc_txbuf;
 	if (b_to_q((ttychar_t *)sc->sc_txbuf, len, &tp->t_outq)) {
 		if (sc->sc_if.if_flags & IFF_DEBUG)
 			addlog("%s: tty output overflow\n",
 			    sc->sc_if.if_xname);
 		return;
+	}
 	sc->sc_if.if_obytes += len;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_tap.c,v 1.92 2016/08/15 05:10:33 christos Exp $	*/
+/*	$NetBSD: if_tap.c,v 1.93 2016/10/02 14:17:07 christos Exp $	*/
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
  *  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.
 @@ -23,27 +23,27 @@
  *  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.
  */
 /*
  * tap(4) is a virtual Ethernet interface.  It appears as a real Ethernet
  * device to the system, but can also be accessed by userland through a
  * character device interface, which allows reading and injecting frames.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.92 2016/08/15 05:10:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.93 2016/10/02 14:17:07 christos Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_modular.h"
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/cprng.h>
 @@ -977,28 +977,27 @@ tap_dev_read(int unit, struct uio *uio,
 		error = 0;
 		goto out;
+	}
 	ifp->if_opackets++;
 	bpf_mtap(ifp, m);
 	/*
 	 * One read is one packet.
 	 */
 	do {
 		error = uiomove(mtod(m, void *),
 		    min(m->m_len, uio->uio_resid), uio);
-		MFREE(m, n);
+		m = n = m_free(m);
 		m = n;
 	} while (m != NULL && uio->uio_resid > 0 && error == 0);
 	if (m != NULL)
 		m_freem(m);
 out:
 	mutex_exit(&sc->sc_rdlock);
 	return (error);
+}
 static int
 tap_fops_stat(file_t *fp, struct stat *st)
+{

 @@ -1,31 +1,31 @@
-/*	$NetBSD: if_tun.c,v 1.132 2016/09/07 10:27:44 ozaki-r Exp $	*/
+/*	$NetBSD: if_tun.c,v 1.133 2016/10/02 14:17:07 christos Exp $	*/
 /*
  * Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
  * Nottingham University 1987.
+ *
  * This source may be freely distributed, however I would be interested
  * in any changes that are made.
+ *
  * This driver takes packets off the IP i/f and hands them up to a
  * user process to have its wicked way with. This driver has its
  * roots in a similar driver written by Phil Cockcroft (formerly) at
  * UCL. This driver is based much more on read/write/poll mode of
  * operation though.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.132 2016/09/07 10:27:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.133 2016/10/02 14:17:07 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 @@ -830,28 +830,27 @@ tunread(dev_t dev, struct uio *uio, int
+				}
+			}
+		}
 	} while (m0 == 0);
 	mutex_exit(&tp->tun_lock);
 	splx(s);
 	/* Copy the mbuf chain */
 	while (m0 && uio->uio_resid > 0 && error == 0) {
 		len = min(uio->uio_resid, m0->m_len);
 		if (len != 0)
 			error = uiomove(mtod(m0, void *), len, uio);
-		MFREE(m0, m);
+		m0 = m = m_free(m0);
 		m0 = m;
+	}
 	if (m0) {
 		TUNDEBUG("Dropping mbuf\n");
 		m_freem(m0);
+	}
 	if (error)
 		ifp->if_ierrors++;
 	return (error);
 out:
 	mutex_exit(&tp->tun_lock);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ppp_tty.c,v 1.62 2016/08/06 02:35:06 pgoyette Exp $	*/
+/*	$NetBSD: ppp_tty.c,v 1.63 2016/10/02 14:17:07 christos Exp $	*/
 /*	Id: ppp_tty.c,v 1.3 1996/07/01 01:04:11 paulus Exp 	*/
 /*
  * ppp_tty.c - Point-to-Point Protocol (PPP) driver for asynchronous
  * 	       tty devices.
+ *
  * Copyright (c) 1984-2000 Carnegie Mellon University. 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
 @@ -83,27 +83,27 @@
  * caused system crashes and packet corruption.  Changed pppstart
  * so that it doesn't just give up with a "collision" if the whole
  * packet doesn't fit in the output ring buffer.
+ *
  * Added priority queueing for interactive IP packets, following
  * the model of if_sl.c, plus hooks for bpf.
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppp_tty.c,v 1.62 2016/08/06 02:35:06 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppp_tty.c,v 1.63 2016/10/02 14:17:07 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "ppp.h"
 #include "opt_ppp.h"
 #endif
 #define VJC
 #define PPP_COMPRESS
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/dkstat.h>
 #include <sys/socket.h>
 @@ -823,28 +823,27 @@ pppasyncstart(struct ppp_softc *sc)
+		    }
 		if (done)
 		    sc->sc_stats.ppp_obytes += q - endseq;
+	    }
 	    if (!done) {
 		/* remember where we got to */
 		m->m_data = start;
 		m->m_len = len;
 		break;
+	    }
 	    /* Finished with this mbuf; free it and move on. */
-	    MFREE(m, m2);
+	    m = m2 = m_free(m);
 	    m = m2;
 	    if (m == NULL) {
 		/* Finished a packet */
 		break;
+	    }
 	    sc->sc_outfcs = pppfcs(sc->sc_outfcs, mtod(m, uint8_t *), m->m_len);
+	}
 	/*
 	 * If m == NULL, we have finished a packet.
 	 * If m != NULL, we've either done as much work this time
 	 * as we need to, or else we've filled up the output queue.
 	 */
 	sc->sc_outm = m;