From 62a3d29539aa109fed1c8a20d63ef95948b13842 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Mon, 23 Aug 2010 16:48:14 +0200 Subject: Cleanup, compatibility - Use is_vmalloc_addr when freeing vmalloc or kmalloc-ed areas. Thus we can get rid of a flag and simplify some functions. - When checking "same" sets, ignore hash size, because resizing changes it. - 2.6.35 compatibility added. - Discuss backward/forward compatibilities in the README file. --- kernel/ip_set_bitmap_ip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kernel/ip_set_bitmap_ip.c') diff --git a/kernel/ip_set_bitmap_ip.c b/kernel/ip_set_bitmap_ip.c index e63bcda..76baa13 100644 --- a/kernel/ip_set_bitmap_ip.c +++ b/kernel/ip_set_bitmap_ip.c @@ -180,7 +180,7 @@ bitmap_ip_destroy(struct ip_set *set) { struct bitmap_ip *map = set->data; - ip_set_free(map->members, set->flags); + ip_set_free(map->members); kfree(map); set->data = NULL; @@ -423,7 +423,7 @@ bitmap_ip_timeout_destroy(struct ip_set *set) struct bitmap_ip_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; @@ -575,7 +575,7 @@ init_map_ip(struct ip_set *set, struct bitmap_ip *map, u32 first_ip, u32 last_ip, u32 elements, u32 hosts, u8 netmask) { - 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_ip = first_ip; -- cgit v1.2.3