 @@ -1,14 +1,14 @@
-/*	$NetBSD: kttcp.c,v 1.39 2016/06/10 13:27:13 ozaki-r Exp $	*/
+/*	$NetBSD: kttcp.c,v 1.40 2016/10/02 14:16:02 christos Exp $	*/
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden and Jason R. Thorpe for
  * Wasabi Systems, Inc.
+ *
  * 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.
 @@ -32,27 +32,27 @@
  * 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.
  */
 /*
  * kttcp.c -- provides kernel support for testing network testing,
  *            see kttcp(4)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.39 2016/06/10 13:27:13 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.40 2016/10/02 14:16:02 christos Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/conf.h>
 #include <sys/systm.h>
 #include <sys/protosw.h>
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/signal.h>
 #include <sys/socketvar.h>
 @@ -464,37 +464,35 @@ kttcp_soreceive(struct socket *so, unsig
 	SBLASTRECORDCHK(&so->so_rcv, "kttcp_soreceive 1");
 	SBLASTMBUFCHK(&so->so_rcv, "kttcp_soreceive 1");
 	nextrecord = m->m_nextpkt;
 	if (pr->pr_flags & PR_ADDR) {
 #ifdef DIAGNOSTIC
 		if (m->m_type != MT_SONAME)
 			panic("receive 1a");
 #endif
 		orig_resid = 0;
 		if (flags & MSG_PEEK) {
 			m = m->m_next;
 		} else {
 			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 && m->m_type == MT_CONTROL && error == 0) {
 		if (flags & MSG_PEEK) {
 			m = m->m_next;
 		} else {
 			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;
+		}
+	}
 	/*
 	 * 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) {
 		if ((flags & MSG_PEEK) == 0) {
 			m->m_nextpkt = nextrecord;
 			/*
 @@ -552,28 +550,27 @@ kttcp_soreceive(struct socket *so, unsig
 				flags |= MSG_EOR;
 			if (flags & MSG_PEEK) {
 				m = m->m_next;
 				moff = 0;
 			} else {
 				nextrecord = m->m_nextpkt;
 				sbfree(&so->so_rcv, m);
 				if (mp) {
 					*mp = m;
 					mp = &m->m_next;
 					so->so_rcv.sb_mb = m = m->m_next;
 					*mp = NULL;
 				} else {
-					MFREE(m, so->so_rcv.sb_mb);
+					m = so->so_rcv.sb_mb = m_free(m);
 					m = so->so_rcv.sb_mb;
+				}
 				/*
 				 * If m != NULL, we also know that
 				 * so->so_rcv.sb_mb != NULL.
 				 */
 				KASSERT(so->so_rcv.sb_mb == m);
 				if (m) {
 					m->m_nextpkt = nextrecord;
 					if (nextrecord == NULL)
 						so->so_rcv.sb_lastrecord = m;
 				} else {
 					so->so_rcv.sb_mb = nextrecord;
 					SB_EMPTY_FIXUP(&so->so_rcv);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: elink3.c,v 1.138 2016/06/10 13:27:13 ozaki-r Exp $	*/
+/*	$NetBSD: elink3.c,v 1.139 2016/10/02 14:16:02 christos Exp $	*/
 /*-
  * Copyright (c) 1998, 2001 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.
+ *
  * 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
 @@ -52,27 +52,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * 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>
-__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.138 2016/06/10 13:27:13 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.139 2016/10/02 14:16:02 christos Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 #include <sys/select.h>
 @@ -1192,49 +1192,47 @@ startagain:
 					    (void *)(mtod(m, u_long) + count);
 					m->m_len -= count;
+				}
 				bus_space_write_multi_stream_4(iot, ioh,
 				    txreg, mtod(m, u_int32_t *), m->m_len >> 2);
 				m->m_data = (void *)(mtod(m, u_long) +
 					(u_long)(m->m_len & ~3));
 				m->m_len -= m->m_len & ~3;
+			}
 			if (m->m_len)  {
 				bus_space_write_multi_1(iot, ioh,
 				    txreg, mtod(m, u_int8_t *), m->m_len);
+			}
-			MFREE(m, m0);
+			m = m0 = m_free(m);
 			m = m0;
+		}
 	} else {
 		for (m = m0; m;) {
 			if (m->m_len > 1)  {
 				if (mtod(m, u_long) & 1)  {
 					bus_space_write_1(iot, ioh,
 					    txreg, *(mtod(m, u_int8_t *)));
 					m->m_data =
 					    (void *)(mtod(m, u_long) + 1);
 					m->m_len -= 1;
+				}
 				bus_space_write_multi_stream_2(iot, ioh,
 				    txreg, mtod(m, u_int16_t *),
 				    m->m_len >> 1);
+			}
 			if (m->m_len & 1)  {
 				bus_space_write_1(iot, ioh, txreg,
 				     *(mtod(m, u_int8_t *) + m->m_len - 1));
+			}
-			MFREE(m, m0);
+			m = m0 = m_free(m);
 			m = m0;
+		}
+	}
 	while (pad--)
 		bus_space_write_1(iot, ioh, txreg, 0);
 	splx(sh);
 	++ifp->if_opackets;
 readcheck:
 	if ((bus_space_read_2(iot, ioh, ep_w1_reg(sc, ELINK_W1_RX_STATUS)) &
 	    ERR_INCOMPLETE) == 0) {
 		/* We received a complete packet. */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hme.c,v 1.93 2016/06/10 13:27:13 ozaki-r Exp $	*/
+/*	$NetBSD: hme.c,v 1.94 2016/10/02 14:16:02 christos Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * 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.
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * HME Ethernet module driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.93 2016/06/10 13:27:13 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.94 2016/10/02 14:16:02 christos Exp $");
 /* #define HMEDEBUG */
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 @@ -655,33 +655,33 @@ hme_init(struct ifnet *ifp)
  */
 int
 hme_put(struct hme_softc *sc, int ri, struct mbuf *m)
 	/* ri:			 Ring index */
+{
 	struct mbuf *n;
 	int len, tlen = 0;
 	char *bp;
 	bp = (char *)sc->sc_rb.rb_txbuf + (ri % sc->sc_rb.rb_ntbuf) * _HME_BUFSZ;
 	for (; m; m = n) {
 		len = m->m_len;
 		if (len == 0) {
-			MFREE(m, n);
+			n = m_free(m);
 			continue;
+		}
 		memcpy(bp, mtod(m, void *), len);
 		bp += len;
 		tlen += len;
-		MFREE(m, n);
+		n = m_free(m);
+	}
 	return (tlen);
+}
 /*
  * Pull data off an interface.
  * Len is length of data, with local net header stripped.
  * We copy the data into mbufs.  When full cluster sized units are present
  * we copy into clusters.
  */
 struct mbuf *
 hme_get(struct hme_softc *sc, int ri, uint32_t flags)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lance.c,v 1.50 2016/06/10 13:27:13 ozaki-r Exp $	*/
+/*	$NetBSD: lance.c,v 1.51 2016/10/02 14:16:02 christos Exp $	*/
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * 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
 @@ -55,27 +55,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.
+ *
  *	@(#)if_le.c	8.2 (Berkeley) 11/16/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.50 2016/06/10 13:27:13 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.51 2016/10/02 14:16:02 christos Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/rndsource.h>
 #include <net/if.h>
 @@ -333,33 +333,33 @@ lance_init(struct ifnet *ifp)
 /*
  * Routine to copy from mbuf chain to transmit buffer in
  * network buffer memory.
  */
 int
 lance_put(struct lance_softc *sc, int boff, struct mbuf *m)
+{
 	struct mbuf *n;
 	int len, tlen = 0;
 	for (; m; m = n) {
 		len = m->m_len;
 		if (len == 0) {
-			MFREE(m, n);
+			n = m_free(m);
 			continue;
+		}
 		(*sc->sc_copytobuf)(sc, mtod(m, void *), boff, len);
 		boff += len;
 		tlen += len;
-		MFREE(m, n);
+		n = m_free(m);
+	}
 	if (tlen < LEMINSIZE) {
 		(*sc->sc_zerobuf)(sc, boff, LEMINSIZE - tlen);
 		tlen = LEMINSIZE;
+	}
 	return (tlen);
+}
 /*
  * Pull data off an interface.
  * Len is length of data, with local net header stripped.
  * We copy the data into mbufs.  When full cluster sized units are present
  * we copy into clusters.

 @@ -1,14 +1,14 @@
-/* $NetBSD: mtd803.c,v 1.31 2016/06/10 13:27:13 ozaki-r Exp $ */
+/* $NetBSD: mtd803.c,v 1.32 2016/10/02 14:16:02 christos Exp $ */
 /*-
+ *
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Peter Bex <Peter.Bex@student.kun.nl>.
+ *
  * 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
 @@ -34,27 +34,27 @@
  * TODO:
  * - Most importantly, get some bus_dmamap_syncs in the correct places.
  *    I don't have access to a computer with PCI other than i386, and i386
  *    is just such a machine where dmamap_syncs don't do anything.
  * - Powerhook for when resuming after standby.
  * - Watchdog stuff doesn't work yet, the system crashes.
  * - There seems to be a CardBus version of the card. (see datasheet)
  *    Perhaps a detach function is necessary then? (free buffs, stop rx/tx etc)
  * - When you enable the TXBUN (Tx buffer unavailable) interrupt, it gets
  *    raised every time a packet is sent. Strange, since everything works anyway
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.31 2016/06/10 13:27:13 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.32 2016/10/02 14:16:02 christos Exp $");
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/syslog.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <net/if_media.h>
 @@ -422,39 +422,39 @@ mtd_mii_writereg(device_t self, int phy,
 int
 mtd_put(struct mtd_softc *sc, int index, struct mbuf *m)
+{
 	int len, tlen;
 	char *buf = (char *)sc->buf + MTD_NUM_RXD * MTD_RXBUF_SIZE
 			+ index * MTD_TXBUF_SIZE;
 	struct mbuf *n;
 	for (tlen = 0; m != NULL; m = n) {
 		len = m->m_len;
 		if (len == 0) {
-			MFREE(m, n);
+			n = m_free(m);
 			continue;
 		} else if (tlen > MTD_TXBUF_SIZE) {
 			/* XXX FIXME: No idea what to do here. */
 			aprint_error_dev(sc->dev, "packet too large! Size = %i\n",
 				tlen);
-			MFREE(m, n);
+			n = m_free(m);
 			continue;
+		}
 		memcpy(buf, mtod(m, void *), len);
 		buf += len;
 		tlen += len;
-		MFREE(m, n);
+		n = m_free(m);
+	}
 	sc->desc[MTD_NUM_RXD + index].conf = MTD_TXD_CONF_PAD | MTD_TXD_CONF_CRC
 		| MTD_TXD_CONF_IRQC
 		| ((tlen << MTD_TXD_PKTS_SHIFT) & MTD_TXD_CONF_PKTS)
 		| (tlen & MTD_TXD_CONF_BUFS);
 	return tlen;
+}
 void
 mtd_start(struct ifnet *ifp)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rrunner.c,v 1.81 2016/06/10 13:27:13 ozaki-r Exp $	*/
+/*	$NetBSD: rrunner.c,v 1.82 2016/10/02 14:16:02 christos Exp $	*/
 /*
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code contributed to The NetBSD Foundation by Kevin M. Lahey
  * of the Numerical Aerospace Simulation Facility, NASA Ames Research
  * Center.
+ *
  * Partially based on a HIPPI driver written by Essential Communications
  * Corporation.  Thanks to Jason Thorpe, Matt Jacob, and Fred Templin
  * for invaluable advice and encouragement!
+ *
 @@ -25,27 +25,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.81 2016/06/10 13:27:13 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.82 2016/10/02 14:16:02 christos Exp $");
 #include "opt_inet.h"
 #include "esh.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 @@ -2212,48 +2212,48 @@ static struct mbuf *
 esh_adjust_mbufs(struct esh_softc *sc, struct mbuf *m)
+{
 	struct mbuf *m0, *n, *n0;
 	u_int32_t write_len;
 	write_len = m->m_pkthdr.len;
 #ifdef DIAGNOSTIC
 	if (write_len > max_write_len)
 		max_write_len = write_len;
 #endif
 	for (n0 = n = m; n; n = n->m_next) {
 		while (n && n->m_len == 0) {
-			MFREE(n, m0);
+			m0 = m_free(n);
 			if (n == m)
 				n = n0 = m = m0;
 			else
 				n = n0->m_next = m0;
+		}
 		if (n == NULL)
 			break;
 		if (mtod(n, long) & 3 || (n->m_next && n->m_len & 3)) {
 			/* Gotta clean it up */
 			struct mbuf *o;
 			u_int32_t len;
 			sc->sc_misaligned_bufs++;
 			MGETHDR(o, M_DONTWAIT, MT_DATA);
 			if (!o)
 				goto bogosity;
 			MCLGET(o, M_DONTWAIT);
 			if (!(o->m_flags & M_EXT)) {
-				MFREE(o, m0);
+				m0 = m_free(o);
 				goto bogosity;
+			}
 			/*
 			 * XXX: Copy as much as we can into the
 			 *      cluster.  For now we can't have more
 			 *      than a cluster in there.  May change.
 			 *      I'd prefer not to get this
 			 *      down-n-dirty, but we have to be able
 			 *      to do this kind of funky copy.
 			 */
 			len = min(MCLBYTES, write_len);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_iy.c,v 1.97 2016/07/14 10:19:06 msaitoh Exp $	*/
+/*	$NetBSD: if_iy.c,v 1.98 2016/10/02 14:16:02 christos Exp $	*/
 /* #define IYDEBUG */
 /* #define IYMEMDEBUG */
 /*-
  * Copyright (c) 1996,2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Ignatios Souvatzis.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,27 +29,27 @@
  * 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.
  */
 /*
  * Supported hardware:
+ *
  * - Intel EtherExpress Pro/10.
  * - possibly other boards using the i82595 chip and no special tweaks.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.97 2016/07/14 10:19:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.98 2016/10/02 14:16:02 christos Exp $");
 #include "opt_inet.h"
 #include <sys/param.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>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 @@ -764,27 +764,27 @@ iystart(struct ifnet *ifp)
 			if (llen > 1)
 				bus_space_write_multi_stream_2(iot, ioh,
 					MEM_PORT_REG, (u_int16_t *) data,
 					llen>>1);
 			residual = llen & 1;
 			if (residual) {
 				resval = *(data + llen - 1);
 #ifdef IYDEBUG
 				printf("%s: got odd mbuf to send.\n",
 				    device_xname(sc->sc_dev));
 #endif
+			}
-			MFREE(m, m0);
+			m0 = m_free(m);
+		}
 		if (residual)
 			bus_space_write_stream_2(iot, ioh, MEM_PORT_REG,
 				resval);
 		pad >>= 1;
 		while (pad-- > 0)
 			bus_space_write_stream_2(iot, ioh, MEM_PORT_REG, 0);
 #ifdef IYDEBUG
 		printf("%s: new last = 0x%x, end = 0x%x.\n",
 		    device_xname(sc->sc_dev), last, end);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ofnet.c,v 1.55 2016/06/10 13:27:14 ozaki-r Exp $	*/
+/*	$NetBSD: ofnet.c,v 1.56 2016/10/02 14:16:03 christos Exp $	*/
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * 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
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH 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>
-__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.55 2016/06/10 13:27:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.56 2016/10/02 14:16:03 christos Exp $");
 #include "ofnet.h"
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 @@ -325,27 +325,27 @@ ofnet_start(struct ifnet *ifp)
 		bpf_mtap(ifp, m0);
 		if (len > ETHERMTU + sizeof(struct ether_header)) {
 			/* packet too large, toss it */
 			ifp->if_oerrors++;
 			m_freem(m0);
 			continue;
+		}
 		for (bufp = buf; (m = m0) != NULL;) {
 			memcpy(bufp, mtod(m, char *), m->m_len);
 			bufp += m->m_len;
-			MFREE(m, m0);
+			m0 = m_free(m);
+		}
 		/*
 		 * We don't know if the interface will auto-pad for
 		 * us, so make sure it's at least as large as a
 		 * minimum size Ethernet packet.
 		 */
 		if (len < (ETHER_MIN_LEN - ETHER_CRC_LEN)) {
 			memset(bufp, 0, ETHER_MIN_LEN - ETHER_CRC_LEN - len);
 			bufp += ETHER_MIN_LEN - ETHER_CRC_LEN - len;
 		} else
 			len = bufp - buf;

	@@ -114,30 +114,27 @@ m_collapse(struct mbuf *m, int maxbufs,		@@ -114,30 +114,27 @@ m_collapse(struct mbuf *m, int maxbufs,
114	#if (!defined(__sparc64__) && !defined(__sun4v__))	114	#if (!defined(__sparc64__) && !defined(__sun4v__))
115	if (m->m_next == NULL)	115	if (m->m_next == NULL)
116	#endif	116	#endif
117	{	117	{
118	*mnew = m;	118	*mnew = m;
119	return (0);	119	return (0);
120	}	120	}
121	return _m_collapse(m, maxbufs, mnew);	121	return _m_collapse(m, maxbufs, mnew);
122	}	122	}
123		123
124	static inline struct mbuf *	124	static inline struct mbuf *
125	m_free_vec(struct mbuf *m)	125	m_free_vec(struct mbuf *m)
126	{	126	{
127	struct mbuf *n = NULL;	127	return m_free(m);
128
129	MFREE(m, n);
130	return (n);
131	}	128	}
132		129
133	static inline void	130	static inline void
134	m_freem_vec(struct mbuf *m)	131	m_freem_vec(struct mbuf *m)
135	{	132	{
136	while (m != NULL)	133	while (m != NULL)
137	m = m_free_vec(m);	134	m = m_free_vec(m);
138	}	135	}
139		136
140	#if (!defined(__sparc64__) && !defined(__sun4v__))	137	#if (!defined(__sparc64__) && !defined(__sun4v__))
141	int	138	int
142	bus_dmamap_load_mvec_sg(bus_dma_tag_t dmat, bus_dmamap_t map, struct mbuf *m0,	139	bus_dmamap_load_mvec_sg(bus_dma_tag_t dmat, bus_dmamap_t map, struct mbuf *m0,
143	bus_dma_segment_t segs, int nsegs, int flags);	140	bus_dma_segment_t segs, int nsegs, int flags);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_cnw.c,v 1.58 2016/06/10 13:27:15 ozaki-r Exp $	*/
+/*	$NetBSD: if_cnw.c,v 1.59 2016/10/02 14:16:03 christos Exp $	*/
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Michael Eriksson.
+ *
  * 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.
 @@ -95,27 +95,27 @@
+ *
  * Unfortunately, a lot of explicit numeric constants were used in the
  * Linux driver. I have tried to use symbolic names whenever possible,
  * but since I don't have any real hardware documentation, there's
  * still one or two "magic numbers" :-(.
+ *
  * Driver limitations: This driver doesn't do multicasting or receiver
  * promiscuity, because of missing hardware documentation. I couldn't
  * get receiver promiscuity to work, and I haven't even tried
  * multicast. Volunteers are welcome, of course :-).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.58 2016/06/10 13:27:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.59 2016/10/02 14:16:03 christos Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 #include <sys/mbuf.h>
 #include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/kauth.h>
 #include <net/if.h>
 @@ -718,28 +718,27 @@ cnw_transmit(struct cnw_softc *sc, struc
 				if (sc->sc_ethercom.ec_if.if_flags & IFF_DEBUG)
 					printf("%s:   next buffer @0x%x\n",
 					    device_xname(sc->sc_dev), buffer);
 #endif
+			}
 			n = mbytes <= bufspace ? mbytes : bufspace;
 			bus_space_write_region_1(sc->sc_memt, sc->sc_memh,
 			    bufptr, mptr, n);
 			bufptr += n;
 			bufspace -= n;
 			mptr += n;
 			mbytes -= n;
+		}
-		MFREE(m, m0);
+		m = m0 = m_free(m);
 		m = m0;
+	}
 	/* Issue transmit command */
 	CNW_CMD2(sc, CNW_CMD_TL, len, len >> 8);
+}
 /*
  * Pull a packet from the card into an mbuf chain.
  */
 struct mbuf *
 cnw_read(struct cnw_softc *sc)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_xi.c,v 1.77 2016/06/10 13:27:15 ozaki-r Exp $ */
+/*	$NetBSD: if_xi.c,v 1.78 2016/10/02 14:16:03 christos Exp $ */
 /*	OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp 	*/
 /*
  * Copyright (c) 2004 Charles M. Hannum.  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.
 @@ -45,27 +45,27 @@
  * 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.
  */
 /*
  * A driver for Xircom CreditCard PCMCIA Ethernet adapters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.77 2016/06/10 13:27:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.78 2016/10/02 14:16:03 christos Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 @@ -801,28 +801,27 @@ xi_start(struct ifnet *ifp)
 	 */
 	s = splhigh();
 	bus_space_write_2(bst, bsh, EDP, (u_int16_t)len + pad);
 	for (m = m0; m; ) {
 		if (m->m_len > 1)
 			bus_space_write_multi_2(bst, bsh, EDP,
 			    mtod(m, u_int16_t *), m->m_len>>1);
 		if (m->m_len & 1) {
 			DPRINTF(XID_CONFIG, ("xi: XXX odd!\n"));
 			bus_space_write_1(bst, bsh, EDP,
 			    *(mtod(m, u_int8_t *) + m->m_len - 1));
+		}
-		MFREE(m, m0);
+		m = m0 = m_free(m);
 		m = m0;
+	}
 	DPRINTF(XID_CONFIG, ("xi: len=%d pad=%d total=%d\n", len, pad, len+pad+4));
 	if (sc->sc_chipset >= XI_CHIPSET_MOHAWK)
 		bus_space_write_1(bst, bsh, CR, TX_PKT | ENABLE_INT);
 	else {
 		for (; pad > 1; pad -= 2)
 			bus_space_write_2(bst, bsh, EDP, 0);
 		if (pad == 1)
 			bus_space_write_1(bst, bsh, EDP, 0);
+	}
 	splx(s);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: be.c,v 1.83 2016/06/10 13:27:15 ozaki-r Exp $	*/
+/*	$NetBSD: be.c,v 1.84 2016/10/02 14:16:03 christos Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * 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.
 @@ -47,27 +47,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHORS 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>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.83 2016/06/10 13:27:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.84 2016/10/02 14:16:03 christos Exp $");
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 @@ -463,33 +463,33 @@ beattach(device_t parent, device_t self,
  */
 static inline int
 be_put(struct be_softc *sc, int idx, struct mbuf *m)
+{
 	struct mbuf *n;
 	int len, tlen = 0, boff = 0;
 	uint8_t *bp;
 	bp = sc->sc_rb.rb_txbuf + (idx % sc->sc_rb.rb_ntbuf) * BE_PKT_BUF_SZ;
 	for (; m; m = n) {
 		len = m->m_len;
 		if (len == 0) {
-			MFREE(m, n);
+			n = m_free(m);
 			continue;
+		}
 		memcpy(bp + boff, mtod(m, void *), len);
 		boff += len;
 		tlen += len;
-		MFREE(m, n);
+		n = m_free(m);
+	}
 	return tlen;
+}
 /*
  * Pull data off an interface.
  * Len is the length of data, with local net header stripped.
  * We copy the data into mbufs.  When full cluster sized units are present,
  * we copy into clusters.
  */
 static inline struct mbuf *
 be_get(struct be_softc *sc, int idx, int totlen)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: qe.c,v 1.65 2016/06/10 13:27:15 ozaki-r Exp $	*/
+/*	$NetBSD: qe.c,v 1.66 2016/10/02 14:16:03 christos Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * 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.
 @@ -56,27 +56,27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Driver for the SBus qec+qe QuadEthernet board.
+ *
  * This driver was written using the AMD MACE Am79C940 documentation, some
  * ideas gleaned from the S/Linux driver for this card, Solaris header files,
  * and a loan of a card from Paul Southworth of the Internet Engineering
  * Group (www.ieng.com).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.65 2016/06/10 13:27:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.66 2016/10/02 14:16:03 christos Exp $");
 #define QEDEBUG
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 @@ -373,33 +373,33 @@ qe_get(struct qe_softc *sc, int idx, int
  */
 inline int
 qe_put(struct qe_softc *sc, int idx, struct mbuf *m)
+{
 	struct mbuf *n;
 	int len, tlen = 0, boff = 0;
 	uint8_t *bp;
 	bp = sc->sc_rb.rb_txbuf + (idx % sc->sc_rb.rb_ntbuf) * QE_PKT_BUF_SZ;
 	for (; m; m = n) {
 		len = m->m_len;
 		if (len == 0) {
-			MFREE(m, n);
+			n = m_free(m);
 			continue;
+		}
 		memcpy(bp + boff, mtod(m, void *), len);
 		boff += len;
 		tlen += len;
-		MFREE(m, n);
+		n = m_free(m);
+	}
 	return (tlen);
+}
 /*
  * Pass a packet to the higher levels.
  */
 inline void
 qe_read(struct qe_softc *sc, int idx, int len)
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	struct mbuf *m;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_se.c,v 1.91 2016/09/07 14:21:01 jakllsch Exp $	*/
+/*	$NetBSD: if_se.c,v 1.92 2016/10/02 14:16:03 christos Exp $	*/
 /*
  * Copyright (c) 1997 Ian W. Dall <ian.dall@dsto.defence.gov.au>
  * 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.
 @@ -49,27 +49,27 @@
  * This driver is also a bit unusual. It must look like a network
  * interface and it must also appear to be a scsi device to the scsi
  * system. Hence there are cases where there are two entry points. eg
  * sestart is to be called from the scsi subsytem and se_ifstart from
  * the network interface subsystem.  In addition, to facilitate scsi
  * commands issued by userland programs, there are open, close and
  * ioctl entry points. This allows a user program to, for example,
  * display the ea41x stats and download new code into the adaptor ---
  * functions which can't be performed through the ifconfig interface.
  * Normal operation does not require any special userland program.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.91 2016/09/07 14:21:01 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.92 2016/10/02 14:16:03 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_atalk.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/syslog.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 @@ -438,28 +438,27 @@ se_ifstart(struct ifnet *ifp)
 	/* We need to use m->m_pkthdr.len, so require the header */
 	if ((m0->m_flags & M_PKTHDR) == 0)
 		panic("ctscstart: no header mbuf");
 	len = m0->m_pkthdr.len;
 	/* Mark the interface busy. */
 	ifp->if_flags |= IFF_OACTIVE;
 	/* Chain; copy into linear buffer we allocated at attach time. */
 	cp = sc->sc_tbuf;
 	for (m = m0; m != NULL; ) {
 		memcpy(cp, mtod(m, u_char *), m->m_len);
 		cp += m->m_len;
-		MFREE(m, m0);
+		m = m0 = m_free(m);
 		m = m0;
+	}
 	if (len < SEMINSIZE) {
 #ifdef SEDEBUG
 		if (sc->sc_debug)
 			printf("se: packet size %d (%zu) < %d\n", len,
 			    cp - (u_char *)sc->sc_tbuf, SEMINSIZE);
 #endif
 		memset(cp, 0, SEMINSIZE - len);
 		len = SEMINSIZE;
+	}
 	/* Fill out SCSI command. */
 	PROTOCMD(ctron_ether_send, send_cmd);