aboutsummaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorAlan Somers <asomers@FreeBSD.org>2016-05-04 22:34:11 +0000
committerAlan Somers <asomers@FreeBSD.org>2016-05-04 22:34:11 +0000
commit8907f744ff167dcf9545e2cb089e2831bdd58cd6 (patch)
tree2b9b397696c8820e2fd08a07204e38c5e1570743 /sys/net
parentdd3f00cbaf11542cacc58ea873ca1adc7c5da2cc (diff)
Notes
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/flowtable.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/net/flowtable.c b/sys/net/flowtable.c
index f45a6872a815d..895b233ab1a3c 100644
--- a/sys/net/flowtable.c
+++ b/sys/net/flowtable.c
@@ -741,10 +741,6 @@ flowtable_lookup_common(struct flowtable *ft, uint32_t *key, int keylen,
return (flowtable_insert(ft, hash, key, keylen, fibnum));
}
-/*
- * used by the bit_alloc macro
- */
-#define calloc(count, size) malloc((count)*(size), M_FTABLE, M_WAITOK | M_ZERO)
static void
flowtable_alloc(struct flowtable *ft)
{
@@ -759,11 +755,10 @@ flowtable_alloc(struct flowtable *ft)
bitstr_t **b;
b = zpcpu_get_cpu(ft->ft_masks, i);
- *b = bit_alloc(ft->ft_size);
+ *b = bit_alloc(ft->ft_size, M_FTABLE, M_WAITOK);
}
- ft->ft_tmpmask = bit_alloc(ft->ft_size);
+ ft->ft_tmpmask = bit_alloc(ft->ft_size, M_FTABLE, M_WAITOK);
}
-#undef calloc
static void
flowtable_free_stale(struct flowtable *ft, struct rtentry *rt, int maxidle)