diff options
Diffstat (limited to 'kernel/net/netfilter/ipset/ip_set_bitmap_gen.h')
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_bitmap_gen.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h b/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h index 9b5f81f..0c1ba2e 100644 --- a/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h +++ b/kernel/net/netfilter/ipset/ip_set_bitmap_gen.h @@ -34,7 +34,7 @@ #define mtype_gc IPSET_TOKEN(MTYPE, _gc) #define mtype MTYPE -#define get_ext(set, map, id) ((map)->extensions + (set)->dsize * (id)) +#define get_ext(set, map, id) ((map)->extensions + ((set)->dsize * (id))) static void mtype_gc_init(struct ip_set *set, void (*gc)(unsigned long ul_set)) @@ -68,12 +68,9 @@ mtype_destroy(struct ip_set *set) del_timer_sync(&map->gc); ip_set_free(map->members); - if (set->dsize) { - if (set->extensions & IPSET_EXT_DESTROY) - mtype_ext_cleanup(set); - ip_set_free(map->extensions); - } - kfree(map); + if (set->dsize && set->extensions & IPSET_EXT_DESTROY) + mtype_ext_cleanup(set); + ip_set_free(map); set->data = NULL; } @@ -92,13 +89,9 @@ mtype_flush(struct ip_set *set) /* Calculate the actual memory size of the set data */ static size_t -mtype_memsize(const struct mtype *map, size_t dsize) +mtype_memsize(const struct mtype *map) { - size_t memsize = sizeof(*map) + - map->memsize + - map->elements * dsize; - - return memsize; + return sizeof(*map) + map->memsize; } static int @@ -106,7 +99,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb) { const struct mtype *map = set->data; struct nlattr *nested; - size_t memsize = mtype_memsize(map, set->dsize) + set->ext_size; + size_t memsize = mtype_memsize(map) + set->ext_size; nested = ipset_nest_start(skb, IPSET_ATTR_DATA); if (!nested) |