1 files changed, 9 insertions, 10 deletions

diff --git a/sys/netgraph/ng_fec.c b/sys/netgraph/ng_fec.c
index 58f16a9..83a3462 100644
--- a/sys/netgraph/ng_fec.c
+++ b/sys/netgraph/ng_fec.c
@@ -284,7 +284,7 @@ ng_fec_get_unit(int *unit)
 		int i, *newarray, newlen;
 
 		newlen = (2 * ng_fec_units_len) + 4;
-		MALLOC(newarray, int *, newlen * sizeof(*ng_fec_units),
+		newarray = malloc(newlen * sizeof(*ng_fec_units),
 		    M_NETGRAPH, M_NOWAIT);
 		if (newarray == NULL) {
 			mtx_unlock(&ng_fec_mtx);
@@ -295,7 +295,7 @@ ng_fec_get_unit(int *unit)
 		for (i = ng_fec_units_len; i < newlen; i++)
 			newarray[i] = ~0;
 		if (ng_fec_units != NULL)
-			FREE(ng_fec_units, M_NETGRAPH);
+			free(ng_fec_units, M_NETGRAPH);
 		ng_fec_units = newarray;
 		ng_fec_units_len = newlen;
 	}
@@ -333,7 +333,7 @@ ng_fec_free_unit(int unit)
 	 */
 	ng_units_in_use--;
 	if (ng_units_in_use == 0) { /* XXX make SMP safe */
-		FREE(ng_fec_units, M_NETGRAPH);
+		free(ng_fec_units, M_NETGRAPH);
 		ng_fec_units_len = 0;
 		ng_fec_units = NULL;
 	}
@@ -403,8 +403,7 @@ ng_fec_addport(struct ng_fec_private *priv, char *iface)
 	}
 
 	/* Allocate new list entry. */
-	MALLOC(new, struct ng_fec_portlist *,
-	    sizeof(struct ng_fec_portlist), M_NETGRAPH, M_NOWAIT);
+	new = malloc(	    sizeof(struct ng_fec_portlist), M_NETGRAPH, M_NOWAIT);
 	if (new == NULL)
 		return(ENOMEM);
 
@@ -511,7 +510,7 @@ ng_fec_delport(struct ng_fec_private *priv, char *iface)
 
 	/* Delete port */
 	TAILQ_REMOVE(&b->ng_fec_ports, p, fec_list);
-	FREE(p, M_NETGRAPH);
+	free(p, M_NETGRAPH);
 	b->fec_ifcnt--;
 
 	if (b->fec_ifcnt == 0)
@@ -1196,13 +1195,13 @@ ng_fec_constructor(node_p node)
 	int error = 0;
 
 	/* Allocate node and interface private structures */
-	MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
+	priv = malloc(sizeof(*priv), M_NETGRAPH, M_NOWAIT | M_ZERO);
 	if (priv == NULL)
 		return (ENOMEM);
 
 	ifp = priv->ifp = if_alloc(IFT_ETHER);
 	if (ifp == NULL) {
-		FREE(priv, M_NETGRAPH);
+		free(priv, M_NETGRAPH);
 		return (ENOSPC);
 	}
 	b = &priv->fec_bundle;
@@ -1213,7 +1212,7 @@ ng_fec_constructor(node_p node)
 	/* Get an interface unit number */
 	if ((error = ng_fec_get_unit(&priv->unit)) != 0) {
 		if_free(ifp);
-		FREE(priv, M_NETGRAPH);
+		free(priv, M_NETGRAPH);
 		return (error);
 	}
 
@@ -1337,7 +1336,7 @@ ng_fec_shutdown(node_p node)
 	if_free_type(priv->ifp, IFT_ETHER);
 	ifmedia_removeall(&priv->ifmedia);
 	ng_fec_free_unit(priv->unit);
-	FREE(priv, M_NETGRAPH);
+	free(priv, M_NETGRAPH);
 	NG_NODE_SET_PRIVATE(node, NULL);
 	NG_NODE_UNREF(node);
 	return (0);