diff options
Diffstat (limited to 'sys/netgraph/ng_mppc.c')
| -rw-r--r-- | sys/netgraph/ng_mppc.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c index 0cf1e72..2a7198f 100644 --- a/sys/netgraph/ng_mppc.c +++ b/sys/netgraph/ng_mppc.c @@ -200,7 +200,7 @@ ng_mppc_constructor(node_p node) priv_p priv; /* Allocate private structure */ - MALLOC(priv, priv_p, sizeof(*priv), M_NETGRAPH_MPPC, M_NOWAIT | M_ZERO); + priv = malloc(sizeof(*priv), M_NETGRAPH_MPPC, M_NOWAIT | M_ZERO); if (priv == NULL) return (ENOMEM); @@ -291,12 +291,11 @@ ng_mppc_rcvmsg(node_p node, item_p item, hook_p lasthook) #ifdef NETGRAPH_MPPC_COMPRESSION /* Initialize state buffers for compression */ if (d->history != NULL) { - FREE(d->history, M_NETGRAPH_MPPC); + free(d->history, M_NETGRAPH_MPPC); d->history = NULL; } if ((cfg->bits & MPPC_BIT) != 0) { - MALLOC(d->history, u_char *, - isComp ? MPPC_SizeOfCompressionHistory() : + d->history = malloc( isComp ? MPPC_SizeOfCompressionHistory() : MPPC_SizeOfDecompressionHistory(), M_NETGRAPH_MPPC, M_NOWAIT); if (d->history == NULL) @@ -421,12 +420,12 @@ ng_mppc_shutdown(node_p node) /* Take down netgraph node */ #ifdef NETGRAPH_MPPC_COMPRESSION if (priv->xmit.history != NULL) - FREE(priv->xmit.history, M_NETGRAPH_MPPC); + free(priv->xmit.history, M_NETGRAPH_MPPC); if (priv->recv.history != NULL) - FREE(priv->recv.history, M_NETGRAPH_MPPC); + free(priv->recv.history, M_NETGRAPH_MPPC); #endif bzero(priv, sizeof(*priv)); - FREE(priv, M_NETGRAPH_MPPC); + free(priv, M_NETGRAPH_MPPC); NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); /* let the node escape */ return (0); |
