Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys MFREE -> m_free
details: https://anonhg.NetBSD.org/src/rev/542a3d1fd8dc
branches: trunk
changeset: 348044:542a3d1fd8dc
user: christos <christos%NetBSD.org@localhost>
date: Sun Oct 02 14:16:02 2016 +0000
description:
MFREE -> m_free
diffstat:
sys/arch/arm/imx/if_enet.c | 6 +++---
sys/arch/emips/ebus/if_le_ebus.c | 8 ++++----
sys/arch/mac68k/dev/if_mc.c | 6 +++---
sys/arch/macppc/dev/am79c950.c | 6 +++---
sys/arch/macppc/dev/if_bm.c | 8 ++++----
sys/dev/ic/elink3.c | 10 ++++------
sys/dev/ic/hme.c | 8 ++++----
sys/dev/ic/lance.c | 8 ++++----
sys/dev/ic/mtd803.c | 10 +++++-----
sys/dev/ic/rrunner.c | 8 ++++----
sys/dev/isa/if_iy.c | 6 +++---
sys/dev/kttcp.c | 13 +++++--------
sys/dev/ofw/ofnet.c | 6 +++---
sys/dev/pci/cxgb/cxgb_mvec.h | 5 +----
sys/dev/pcmcia/if_cnw.c | 7 +++----
sys/dev/pcmcia/if_xi.c | 7 +++----
sys/dev/sbus/be.c | 8 ++++----
sys/dev/sbus/qe.c | 8 ++++----
sys/dev/scsipi/if_se.c | 7 +++----
sys/net/if_gre.c | 10 ++++------
sys/net/if_ppp.c | 6 +++---
sys/net/if_sl.c | 7 +++----
sys/net/if_strip.c | 7 +++----
sys/net/if_tap.c | 7 +++----
sys/net/if_tun.c | 7 +++----
sys/net/ppp_tty.c | 7 +++----
26 files changed, 89 insertions(+), 107 deletions(-)
diffs (truncated from 808 to 300 lines):
diff -r dda43017d643 -r 542a3d1fd8dc sys/arch/arm/imx/if_enet.c
--- a/sys/arch/arm/imx/if_enet.c Sun Oct 02 13:09:24 2016 +0000
+++ b/sys/arch/arm/imx/if_enet.c Sun Oct 02 14:16:02 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_enet.c,v 1.8 2016/06/15 07:26:11 ryo Exp $ */
+/* $NetBSD: if_enet.c,v 1.9 2016/10/02 14:25:26 christos Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.8 2016/06/15 07:26:11 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.9 2016/10/02 14:25:26 christos Exp $");
#include "vlan.h"
@@ -1507,7 +1507,7 @@
memcpy(mtod(x, void *), mtod(m, void *),
m->m_len);
p->m_next = x;
- MFREE(m, x->m_next);
+ x->m_next = m_free(m);
m = x;
}
}
diff -r dda43017d643 -r 542a3d1fd8dc sys/arch/emips/ebus/if_le_ebus.c
--- a/sys/arch/emips/ebus/if_le_ebus.c Sun Oct 02 13:09:24 2016 +0000
+++ b/sys/arch/emips/ebus/if_le_ebus.c Sun Oct 02 14:16:02 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_ebus.c,v 1.9 2016/06/10 13:27:11 ozaki-r Exp $ */
+/* $NetBSD: if_le_ebus.c,v 1.10 2016/10/02 14:25:26 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.9 2016/06/10 13:27:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.10 2016/10/02 14:25:26 christos Exp $");
#include "opt_inet.h"
@@ -937,7 +937,7 @@
for (; m; m = n) {
len = m->m_len;
if (len == 0) {
- MFREE(m, n);
+ n = m_free(m);
if (m == *pm)
*pm = n;
continue;
@@ -990,7 +990,7 @@
cp += len;
tlen -= len;
- MFREE(m, mm);
+ mm = m_free(m);
}
diff -r dda43017d643 -r 542a3d1fd8dc sys/arch/mac68k/dev/if_mc.c
--- a/sys/arch/mac68k/dev/if_mc.c Sun Oct 02 13:09:24 2016 +0000
+++ b/sys/arch/mac68k/dev/if_mc.c Sun Oct 02 14:16:02 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mc.c,v 1.42 2016/06/10 13:27:11 ozaki-r Exp $ */
+/* $NetBSD: if_mc.c,v 1.43 2016/10/02 14:25:26 christos Exp $ */
/*-
* Copyright (c) 1997 David Huang <khym%azeotrope.org@localhost>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.42 2016/06/10 13:27:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.43 2016/10/02 14:25:26 christos Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -407,7 +407,7 @@
totlen += len;
memcpy(buff, data, len);
buff += len;
- MFREE(m, n);
+ n = m_free(m);
}
if (totlen > PAGE_SIZE)
diff -r dda43017d643 -r 542a3d1fd8dc sys/arch/macppc/dev/am79c950.c
--- a/sys/arch/macppc/dev/am79c950.c Sun Oct 02 13:09:24 2016 +0000
+++ b/sys/arch/macppc/dev/am79c950.c Sun Oct 02 14:16:02 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: am79c950.c,v 1.35 2016/06/10 13:27:11 ozaki-r Exp $ */
+/* $NetBSD: am79c950.c,v 1.36 2016/10/02 14:25:26 christos Exp $ */
/*-
* Copyright (c) 1997 David Huang <khym%bga.com@localhost>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.35 2016/06/10 13:27:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.36 2016/10/02 14:25:26 christos Exp $");
#include "opt_inet.h"
@@ -417,7 +417,7 @@
totlen += len;
memcpy(buff, data, len);
buff += len;
- MFREE(m, n);
+ n = m_free(m);
}
if (totlen > PAGE_SIZE)
diff -r dda43017d643 -r 542a3d1fd8dc sys/arch/macppc/dev/if_bm.c
--- a/sys/arch/macppc/dev/if_bm.c Sun Oct 02 13:09:24 2016 +0000
+++ b/sys/arch/macppc/dev/if_bm.c Sun Oct 02 14:16:02 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bm.c,v 1.49 2016/07/15 22:10:47 macallan Exp $ */
+/* $NetBSD: if_bm.c,v 1.50 2016/10/02 14:25:26 christos Exp $ */
/*-
* Copyright (C) 1998, 1999, 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bm.c,v 1.49 2016/07/15 22:10:47 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bm.c,v 1.50 2016/10/02 14:25:26 christos Exp $");
#include "opt_inet.h"
@@ -621,13 +621,13 @@
for (; m; m = n) {
len = m->m_len;
if (len == 0) {
- MFREE(m, n);
+ n = m_feee(m);
continue;
}
memcpy(buff, mtod(m, void *), len);
buff = (char *)buff + len;
tlen += len;
- MFREE(m, n);
+ n = m_free(m);
}
if (tlen > PAGE_SIZE)
panic("%s: putpacket packet overflow",
diff -r dda43017d643 -r 542a3d1fd8dc sys/dev/ic/elink3.c
--- a/sys/dev/ic/elink3.c Sun Oct 02 13:09:24 2016 +0000
+++ b/sys/dev/ic/elink3.c Sun Oct 02 14:16:02 2016 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -62,7 +62,7 @@
*/
#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"
@@ -1202,8 +1202,7 @@
bus_space_write_multi_1(iot, ioh,
txreg, mtod(m, u_int8_t *), m->m_len);
}
- MFREE(m, m0);
- m = m0;
+ m = m0 = m_free(m);
}
} else {
for (m = m0; m;) {
@@ -1223,8 +1222,7 @@
bus_space_write_1(iot, ioh, txreg,
*(mtod(m, u_int8_t *) + m->m_len - 1));
}
- MFREE(m, m0);
- m = m0;
+ m = m0 = m_free(m);
}
}
while (pad--)
diff -r dda43017d643 -r 542a3d1fd8dc sys/dev/ic/hme.c
--- a/sys/dev/ic/hme.c Sun Oct 02 13:09:24 2016 +0000
+++ b/sys/dev/ic/hme.c Sun Oct 02 14:16:02 2016 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -34,7 +34,7 @@
*/
#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 */
@@ -665,13 +665,13 @@
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);
}
diff -r dda43017d643 -r 542a3d1fd8dc sys/dev/ic/lance.c
--- a/sys/dev/ic/lance.c Sun Oct 02 13:09:24 2016 +0000
+++ b/sys/dev/ic/lance.c Sun Oct 02 14:16:02 2016 +0000
@@ -1,4 +1,4 @@
-/* $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.
@@ -65,7 +65,7 @@
*/
#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>
@@ -343,13 +343,13 @@
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);
diff -r dda43017d643 -r 542a3d1fd8dc sys/dev/ic/mtd803.c
--- a/sys/dev/ic/mtd803.c Sun Oct 02 13:09:24 2016 +0000
+++ b/sys/dev/ic/mtd803.c Sun Oct 02 14:16:02 2016 +0000
@@ -1,4 +1,4 @@
-/* $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 $ */
/*-
*
@@ -44,7 +44,7 @@
*/
#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>
@@ -432,19 +432,19 @@
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
diff -r dda43017d643 -r 542a3d1fd8dc sys/dev/ic/rrunner.c
--- a/sys/dev/ic/rrunner.c Sun Oct 02 13:09:24 2016 +0000
Home |
Main Index |
Thread Index |
Old Index