Get rid of the twisted MFREE() macro entirely.

Reviewed by:	dg, bmilekic
MFC after:	3 days

5 files changed, 26 insertions, 31 deletions

diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 8f7c38d46073..82c16e0c9b95 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1401,9 +1401,10 @@ ppp_inproc(sc, m)
 	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);
-	} else
+	    mp->m_next = m_free(m);
+	} else {
 	    mp->m_next = m;
+	}
 	m = mp;
 	ilen += hlen - xlen;
 
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 7d3b51de7f4e..228f3968ef81 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -601,7 +601,6 @@ slstart(tp)
 	register u_char *cp;
 	register struct ip *ip;
 	int s;
-	struct mbuf *m2;
 	register int len = 0;
 
 	for (;;) {
@@ -761,8 +760,7 @@ slstart(tp)
 					sc->sc_if.if_obytes += 2;
 				}
 			}
-			MFREE(m, m2);
-			m = m2;
+			m = m_free(m);
 		}
 
 		if (putc(FRAME_END, &tp->t_outq)) {
diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c
index 5505a60da5ca..da0fb8acf766 100644
--- a/sys/net/if_tap.c
+++ b/sys/net/if_tap.c
@@ -768,7 +768,7 @@ tapread(dev, uio, flag)
 {
 	struct tap_softc	*tp = dev->si_drv1;
 	struct ifnet		*ifp = &tp->tap_if;
-	struct mbuf		*m = NULL, *m0 = NULL;
+	struct mbuf		*m = NULL;
 	int			 error = 0, len, s;
 
 	TAPDEBUG("%s%d reading, minor = %#x\n", 
@@ -786,10 +786,10 @@ tapread(dev, uio, flag)
 	/* sleep until we get a packet */
 	do {
 		s = splimp();
-		IF_DEQUEUE(&ifp->if_snd, m0);
+		IF_DEQUEUE(&ifp->if_snd, m);
 		splx(s);
 
-		if (m0 == NULL) {
+		if (m == NULL) {
 			if (flag & IO_NDELAY)
 				return (EWOULDBLOCK);
 			
@@ -798,27 +798,26 @@ tapread(dev, uio, flag)
 			if (error)
 				return (error);
 		}
-	} while (m0 == NULL);
+	} while (m == NULL);
 
 	/* feed packet to bpf */
 	if (ifp->if_bpf != NULL)
-		bpf_mtap(ifp, m0);
+		bpf_mtap(ifp, m);
 
 	/* xfer packet to user space */
-	while ((m0 != NULL) && (uio->uio_resid > 0) && (error == 0)) {
-		len = min(uio->uio_resid, m0->m_len);
+	while ((m != NULL) && (uio->uio_resid > 0) && (error == 0)) {
+		len = min(uio->uio_resid, m->m_len);
 		if (len == 0)
 			break;
 
-		error = uiomove(mtod(m0, caddr_t), len, uio);
-		MFREE(m0, m);
-		m0 = m;
+		error = uiomove(mtod(m, caddr_t), len, uio);
+		m = m_free(m);
 	}
 
-	if (m0 != NULL) {
+	if (m != NULL) {
 		TAPDEBUG("%s%d dropping mbuf, minor = %#x\n", ifp->if_name, 
 			ifp->if_unit, minor(dev));
-		m_freem(m0);
+		m_freem(m);
 	}
 
 	return (error);
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 20f74376d614..f116b1d31066 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -636,7 +636,7 @@ tunread(dev_t dev, struct uio *uio, int flag)
 {
 	struct tun_softc *tp = dev->si_drv1;
 	struct ifnet	*ifp = &tp->tun_if;
-	struct mbuf	*m, *m0;
+	struct mbuf	*m;
 	int		error=0, len, s;
 
 	TUNDEBUG ("%s%d: read\n", ifp->if_name, ifp->if_unit);
@@ -650,8 +650,8 @@ tunread(dev_t dev, struct uio *uio, int flag)
 
 	s = splimp();
 	do {
-		IF_DEQUEUE(&ifp->if_snd, m0);
-		if (m0 == 0) {
+		IF_DEQUEUE(&ifp->if_snd, m);
+		if (m == NULL) {
 			if (flag & IO_NDELAY) {
 				splx(s);
 				return EWOULDBLOCK;
@@ -663,20 +663,19 @@ tunread(dev_t dev, struct uio *uio, int flag)
 				return error;
 			}
 		}
-	} while (m0 == 0);
+	} while (m == NULL);
 	splx(s);
 
-	while (m0 && uio->uio_resid > 0 && error == 0) {
-		len = min(uio->uio_resid, m0->m_len);
+	while (m && uio->uio_resid > 0 && error == 0) {
+		len = min(uio->uio_resid, m->m_len);
 		if (len != 0)
-			error = uiomove(mtod(m0, caddr_t), len, uio);
-		MFREE(m0, m);
-		m0 = m;
+			error = uiomove(mtod(m, caddr_t), len, uio);
+		m = m_free(m);
 	}
 
-	if (m0) {
+	if (m) {
 		TUNDEBUG("%s%d: Dropping mbuf\n", ifp->if_name, ifp->if_unit);
-		m_freem(m0);
+		m_freem(m);
 	}
 	return error;
 }
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index 635e7adbf698..3838286f5b36 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -549,7 +549,6 @@ pppasyncstart(sc)
     register int len;
     register u_char *start, *stop, *cp;
     int n, ndone, done, idle;
-    struct mbuf *m2;
     int s;
 
     idle = 0;
@@ -687,8 +686,7 @@ pppasyncstart(sc)
 	    }
 
 	    /* Finished with this mbuf; free it and move on. */
-	    MFREE(m, m2);
-	    m = m2;
+	    m = m_free(m);
 	    if (m == NULL) {
 		/* Finished a packet */
 		break;