diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-08-23 16:48:14 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-08-23 16:48:14 +0200 |
| commit | 62a3d29539aa109fed1c8a20d63ef95948b13842 (patch) | |
| tree | 46aa8b0dcc0d601a354031b477283ddf3f2bae1f /kernel/ip_set_bitmap_ipmac.c | |
| parent | 1b8c69e14d97bf5d0e973740c5802fdbf96f756d (diff) | |
Cleanup, compatibilityv5.0-pre7
- 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.
Diffstat (limited to 'kernel/ip_set_bitmap_ipmac.c')
| -rw-r--r-- | kernel/ip_set_bitmap_ipmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/ip_set_bitmap_ipmac.c b/kernel/ip_set_bitmap_ipmac.c index 5833c77..c595e18 100644 --- a/kernel/ip_set_bitmap_ipmac.c +++ b/kernel/ip_set_bitmap_ipmac.c @@ -423,7 +423,7 @@ bitmap_ipmac_destroy(struct ip_set *set) if (with_timeout(map->timeout)) del_timer_sync(&map->gc); - ip_set_free(map->members, set->flags); + ip_set_free(map->members); kfree(map); set->data = NULL; @@ -553,7 +553,7 @@ init_map_ipmac(struct ip_set *set, struct bitmap_ipmac *map, u32 first_ip, u32 last_ip) { map->members = ip_set_alloc((last_ip - first_ip + 1) * map->dsize, - GFP_KERNEL, &set->flags); + GFP_KERNEL); if (!map->members) return false; map->first_ip = first_ip; |