Module Name: src
Committed By: christos
Date: Sun Oct 2 14:17:07 UTC 2016
Modified Files:
src/sys/net: if_gre.c if_ppp.c if_sl.c if_strip.c if_tap.c if_tun.c
ppp_tty.c
Log Message:
MFREE -> m_free
To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/sys/net/if_gre.c
cvs rdiff -u -r1.157 -r1.158 src/sys/net/if_ppp.c
cvs rdiff -u -r1.126 -r1.127 src/sys/net/if_sl.c
cvs rdiff -u -r1.106 -r1.107 src/sys/net/if_strip.c
cvs rdiff -u -r1.92 -r1.93 src/sys/net/if_tap.c
cvs rdiff -u -r1.132 -r1.133 src/sys/net/if_tun.c
cvs rdiff -u -r1.62 -r1.63 src/sys/net/ppp_tty.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_gre.c
diff -u src/sys/net/if_gre.c:1.170 src/sys/net/if_gre.c:1.171
--- src/sys/net/if_gre.c:1.170 Sun Aug 7 13:38:33 2016
+++ src/sys/net/if_gre.c Sun Oct 2 10:17:07 2016
@@ -1,4 +1,4 @@
-/* $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.
@@ -45,7 +45,7 @@
*/
#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"
@@ -609,8 +609,7 @@ gre_soreceive(struct socket *so, struct
panic("receive 1a");
#endif
sbfree(&so->so_rcv, m);
- MFREE(m, so->so_rcv.sb_mb);
- m = so->so_rcv.sb_mb;
+ m = so->so_rcv.sb_mb = m_free(m);
}
while (m != NULL && m->m_type == MT_CONTROL && error == 0) {
sbfree(&so->so_rcv, m);
@@ -621,8 +620,7 @@ gre_soreceive(struct socket *so, struct
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 = so->so_rcv.sb_mb = m_free(m);
}
/*
Index: src/sys/net/if_ppp.c
diff -u src/sys/net/if_ppp.c:1.157 src/sys/net/if_ppp.c:1.158
--- src/sys/net/if_ppp.c:1.157 Sun Aug 7 13:38:34 2016
+++ src/sys/net/if_ppp.c Sun Oct 2 10:17:07 2016
@@ -1,4 +1,4 @@
-/* $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 */
/*
@@ -102,7 +102,7 @@
*/
#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"
@@ -1593,7 +1593,7 @@ ppp_inproc(struct ppp_softc *sc, struct
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;
Index: src/sys/net/if_sl.c
diff -u src/sys/net/if_sl.c:1.126 src/sys/net/if_sl.c:1.127
--- src/sys/net/if_sl.c:1.126 Sun Aug 7 13:38:34 2016
+++ src/sys/net/if_sl.c Sun Oct 2 10:17:07 2016
@@ -1,4 +1,4 @@
-/* $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
@@ -60,7 +60,7 @@
*/
#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"
@@ -846,8 +846,7 @@ slintr(void *arg)
}
bp = cp;
}
- MFREE(m, m2);
- m = m2;
+ m = m2 = m_free(m);
}
if (putc(FRAME_END, &tp->t_outq)) {
Index: src/sys/net/if_strip.c
diff -u src/sys/net/if_strip.c:1.106 src/sys/net/if_strip.c:1.107
--- src/sys/net/if_strip.c:1.106 Sun Aug 7 13:38:34 2016
+++ src/sys/net/if_strip.c Sun Oct 2 10:17:07 2016
@@ -1,4 +1,4 @@
-/* $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 $ */
/*
@@ -87,7 +87,7 @@
*/
#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"
@@ -676,8 +676,7 @@ strip_sendbody(struct strip_softc *sc, s
dp = StuffData(mtod(m, u_char *), m->m_len, dp,
&rllstate_ptr);
}
- MFREE(m, m2);
- m = m2;
+ m = m2 = m_free(m);
}
/*
Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.92 src/sys/net/if_tap.c:1.93
--- src/sys/net/if_tap.c:1.92 Mon Aug 15 01:10:33 2016
+++ src/sys/net/if_tap.c Sun Oct 2 10:17:07 2016
@@ -1,4 +1,4 @@
-/* $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.
@@ -33,7 +33,7 @@
*/
#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)
@@ -987,8 +987,7 @@ tap_dev_read(int unit, struct uio *uio,
do {
error = uiomove(mtod(m, void *),
min(m->m_len, uio->uio_resid), uio);
- MFREE(m, n);
- m = n;
+ m = n = m_free(m);
} while (m != NULL && uio->uio_resid > 0 && error == 0);
if (m != NULL)
Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.132 src/sys/net/if_tun.c:1.133
--- src/sys/net/if_tun.c:1.132 Wed Sep 7 06:27:44 2016
+++ src/sys/net/if_tun.c Sun Oct 2 10:17:07 2016
@@ -1,4 +1,4 @@
-/* $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 <[email protected]>
@@ -15,7 +15,7 @@
*/
#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"
@@ -840,8 +840,7 @@ tunread(dev_t dev, struct uio *uio, int
len = min(uio->uio_resid, m0->m_len);
if (len != 0)
error = uiomove(mtod(m0, void *), len, uio);
- MFREE(m0, m);
- m0 = m;
+ m0 = m = m_free(m0);
}
if (m0) {
Index: src/sys/net/ppp_tty.c
diff -u src/sys/net/ppp_tty.c:1.62 src/sys/net/ppp_tty.c:1.63
--- src/sys/net/ppp_tty.c:1.62 Fri Aug 5 22:35:06 2016
+++ src/sys/net/ppp_tty.c Sun Oct 2 10:17:07 2016
@@ -1,4 +1,4 @@
-/* $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 */
/*
@@ -93,7 +93,7 @@
/* 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"
@@ -833,8 +833,7 @@ pppasyncstart(struct ppp_softc *sc)
}
/* Finished with this mbuf; free it and move on. */
- MFREE(m, m2);
- m = m2;
+ m = m2 = m_free(m);
if (m == NULL) {
/* Finished a packet */
break;
