diff options
Diffstat (limited to 'sys/contrib/altq/altq/altq_subr.c')
| -rw-r--r-- | sys/contrib/altq/altq/altq_subr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c index ab945eb4fa0d..0dd1801e82ae 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/contrib/altq/altq/altq_subr.c @@ -397,13 +397,13 @@ tbr_set(ifq, profile) return (ENOENT); } ifq->altq_tbr = NULL; - FREE(tbr, M_DEVBUF); + free(tbr, M_DEVBUF); IFQ_UNLOCK(ifq); return (0); } IFQ_UNLOCK(ifq); - MALLOC(tbr, struct tb_regulator *, sizeof(struct tb_regulator), + tbr = malloc(sizeof(struct tb_regulator), M_DEVBUF, M_WAITOK); if (tbr == NULL) { /* can not happen */ IFQ_UNLOCK(ifq); @@ -426,7 +426,7 @@ tbr_set(ifq, profile) ifq->altq_tbr = tbr; /* set the new tbr */ if (otbr != NULL) - FREE(otbr, M_DEVBUF); + free(otbr, M_DEVBUF); else { if (tbr_timer == 0) { CALLOUT_RESET(&tbr_callout, 1, tbr_timeout, (void *)0); @@ -1402,7 +1402,7 @@ acc_add_filter(classifier, filter, class, phandle) return (EINVAL); #endif - MALLOC(afp, struct acc_filter *, sizeof(struct acc_filter), + afp = malloc(sizeof(struct acc_filter), M_DEVBUF, M_WAITOK); if (afp == NULL) return (ENOMEM); @@ -1529,7 +1529,7 @@ acc_delete_filter(classifier, handle) LIST_REMOVE(afp, f_chain); splx(s); - FREE(afp, M_DEVBUF); + free(afp, M_DEVBUF); /* todo: update filt_bmask */ @@ -1559,7 +1559,7 @@ acc_discard_filters(classifier, class, all) LIST_FOREACH(afp, &classifier->acc_filters[i], f_chain) if (all || afp->f_class == class) { LIST_REMOVE(afp, f_chain); - FREE(afp, M_DEVBUF); + free(afp, M_DEVBUF); /* start again from the head */ break; } @@ -1981,7 +1981,7 @@ ip4f_init(void) TAILQ_INIT(&ip4f_list); for (i=0; i<IP4F_TABSIZE; i++) { - MALLOC(fp, struct ip4_frag *, sizeof(struct ip4_frag), + fp = malloc(sizeof(struct ip4_frag), M_DEVBUF, M_NOWAIT); if (fp == NULL) { printf("ip4f_init: can't alloc %dth entry!\n", i); |