diff options
Diffstat (limited to 'kernel/ip_set_bitmap_port.c')
-rw-r--r-- | kernel/ip_set_bitmap_port.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/kernel/ip_set_bitmap_port.c b/kernel/ip_set_bitmap_port.c index c96b06c..27363f6 100644 --- a/kernel/ip_set_bitmap_port.c +++ b/kernel/ip_set_bitmap_port.c @@ -166,7 +166,7 @@ bitmap_port_destroy(struct ip_set *set) { struct bitmap_port *map = set->data; - ip_set_free(map->members, set->flags); + ip_set_free(map->members); kfree(map); set->data = NULL; @@ -265,7 +265,7 @@ const struct ip_set_type_variant bitmap_port __read_mostly = { /* Timeout variant */ struct bitmap_port_timeout { - void *members; /* the set members */ + unsigned long *members; /* the set members */ u16 first_port; /* host byte order, included in range */ u16 last_port; /* host byte order, included in range */ size_t memsize; /* members size */ @@ -277,21 +277,17 @@ struct bitmap_port_timeout { static inline bool bitmap_port_timeout_test(const struct bitmap_port_timeout *map, u16 id) { - unsigned long *timeout = map->members; - - return ip_set_timeout_test(timeout[id]); + return ip_set_timeout_test(map->members[id]); } static int bitmap_port_timeout_add(const struct bitmap_port_timeout *map, u16 id, u32 timeout) { - unsigned long *table = map->members; - if (bitmap_port_timeout_test(map, id)) return -IPSET_ERR_EXIST; - table[id] = ip_set_timeout_set(timeout); + map->members[id] = ip_set_timeout_set(timeout); return 0; } @@ -300,13 +296,12 @@ static int bitmap_port_timeout_del(const struct bitmap_port_timeout *map, u16 id) { - unsigned long *table = map->members; int ret = -IPSET_ERR_EXIST; if (bitmap_port_timeout_test(map, id)) ret = 0; - table[id] = IPSET_ELEM_UNSET; + map->members[id] = IPSET_ELEM_UNSET; return ret; } @@ -403,7 +398,7 @@ bitmap_port_timeout_destroy(struct ip_set *set) struct bitmap_port_timeout *map = set->data; del_timer_sync(&map->gc); - ip_set_free(map->members, set->flags); + ip_set_free(map->members); kfree(map); set->data = NULL; @@ -551,7 +546,7 @@ static bool init_map_port(struct ip_set *set, struct bitmap_port *map, u16 first_port, u16 last_port) { - map->members = ip_set_alloc(map->memsize, GFP_KERNEL, &set->flags); + map->members = ip_set_alloc(map->memsize, GFP_KERNEL); if (!map->members) return false; map->first_port = first_port; |