Module Name: src
Committed By: christos
Date: Sun Oct 2 14:25:27 UTC 2016
Modified Files:
src/sys/arch/arm/imx: if_enet.c
src/sys/arch/emips/ebus: if_le_ebus.c
src/sys/arch/mac68k/dev: if_mc.c
src/sys/arch/macppc/dev: am79c950.c if_bm.c
Log Message:
MFREE -> m_free
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/if_enet.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/emips/ebus/if_le_ebus.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/mac68k/dev/if_mc.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/macppc/dev/am79c950.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/macppc/dev/if_bm.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/arch/arm/imx/if_enet.c
diff -u src/sys/arch/arm/imx/if_enet.c:1.8 src/sys/arch/arm/imx/if_enet.c:1.9
--- src/sys/arch/arm/imx/if_enet.c:1.8 Wed Jun 15 03:26:11 2016
+++ src/sys/arch/arm/imx/if_enet.c Sun Oct 2 10:25:26 2016
@@ -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 <r...@nerv.org>
@@ -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 @@ enet_encap_mbufalign(struct mbuf **mp)
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;
}
}
Index: src/sys/arch/emips/ebus/if_le_ebus.c
diff -u src/sys/arch/emips/ebus/if_le_ebus.c:1.9 src/sys/arch/emips/ebus/if_le_ebus.c:1.10
--- src/sys/arch/emips/ebus/if_le_ebus.c:1.9 Fri Jun 10 09:27:11 2016
+++ src/sys/arch/emips/ebus/if_le_ebus.c Sun Oct 2 10:25:26 2016
@@ -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 @@ int enic_put(struct enic_softc *sc, stru
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 @@ int enic_put(struct enic_softc *sc, stru
cp += len;
tlen -= len;
- MFREE(m, mm);
+ mm = m_free(m);
}
Index: src/sys/arch/mac68k/dev/if_mc.c
diff -u src/sys/arch/mac68k/dev/if_mc.c:1.42 src/sys/arch/mac68k/dev/if_mc.c:1.43
--- src/sys/arch/mac68k/dev/if_mc.c:1.42 Fri Jun 10 09:27:11 2016
+++ src/sys/arch/mac68k/dev/if_mc.c Sun Oct 2 10:25:26 2016
@@ -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 <k...@azeotrope.org>
@@ -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 @@ maceput(struct mc_softc *sc, struct mbuf
totlen += len;
memcpy(buff, data, len);
buff += len;
- MFREE(m, n);
+ n = m_free(m);
}
if (totlen > PAGE_SIZE)
Index: src/sys/arch/macppc/dev/am79c950.c
diff -u src/sys/arch/macppc/dev/am79c950.c:1.35 src/sys/arch/macppc/dev/am79c950.c:1.36
--- src/sys/arch/macppc/dev/am79c950.c:1.35 Fri Jun 10 09:27:11 2016
+++ src/sys/arch/macppc/dev/am79c950.c Sun Oct 2 10:25:26 2016
@@ -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 <k...@bga.com>
@@ -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 @@ maceput(struct mc_softc *sc, struct mbuf
totlen += len;
memcpy(buff, data, len);
buff += len;
- MFREE(m, n);
+ n = m_free(m);
}
if (totlen > PAGE_SIZE)
Index: src/sys/arch/macppc/dev/if_bm.c
diff -u src/sys/arch/macppc/dev/if_bm.c:1.49 src/sys/arch/macppc/dev/if_bm.c:1.50
--- src/sys/arch/macppc/dev/if_bm.c:1.49 Fri Jul 15 18:10:47 2016
+++ src/sys/arch/macppc/dev/if_bm.c Sun Oct 2 10:25:26 2016
@@ -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 @@ bmac_put(struct bmac_softc *sc, void *bu
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",
