diff options
author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2009-08-18 19:52:26 +0200 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2009-08-18 19:52:26 +0200 |
commit | d19f4ca4451f02add0e8edfcb69882d5b3e0cc9e (patch) | |
tree | e865cb32f704306dcc20e7fe47245ab91663b67b /kernel/include | |
parent | 027dc5fb9021ce3f814a345b17c56d899733569a (diff) |
ipset 3.1 releasev3.1
A few minor bugs fixed and cleanups:
- Nonexistent sets were reported as existing sets when testing
from userspace in setlist type of sets (bug reported by Victor A.
Safronov)
- When saving sets, setlist type of sets must come last in order
to satisfy the dependency from the elements (bug reported by Marty B.)
- Sparse insists that the flags argument to kmalloc() is gfp_t
(Stephen Hemminger)
- Correct format specifiers and change %i to %d (Jan Engelhardt)
- Fix the definition of 'bool' for kernels <= 2.6.18 (Jan Engelhardt)
Diffstat (limited to 'kernel/include')
-rw-r--r-- | kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h | 2 | ||||
-rw-r--r-- | kernel/include/linux/netfilter_ipv4/ip_set_hashes.h | 8 | ||||
-rw-r--r-- | kernel/include/linux/netfilter_ipv4/ip_set_malloc.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h b/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h index d537639..90e87e3 100644 --- a/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h +++ b/kernel/include/linux/netfilter_ipv4/ip_set_bitmaps.h @@ -19,7 +19,7 @@ type##_create(struct ip_set *set, const void *data, u_int32_t size) \ \ map = kmalloc(sizeof(struct ip_set_##type), GFP_KERNEL); \ if (!map) { \ - DP("out of memory for %lu bytes", \ + DP("out of memory for %zu bytes", \ sizeof(struct ip_set_##type)); \ return -ENOMEM; \ } \ diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h b/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h index 4ca8431..f7d6a69 100644 --- a/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h +++ b/kernel/include/linux/netfilter_ipv4/ip_set_hashes.h @@ -36,14 +36,14 @@ type##_retry(struct ip_set *set) \ tmp = kmalloc(sizeof(struct ip_set_##type) \ + map->probes * sizeof(initval_t), GFP_ATOMIC); \ if (!tmp) { \ - DP("out of memory for %lu bytes", \ + DP("out of memory for %zu bytes", \ sizeof(struct ip_set_##type) \ + map->probes * sizeof(initval_t)); \ return -ENOMEM; \ } \ tmp->members = harray_malloc(hashsize, sizeof(dtype), GFP_ATOMIC);\ if (!tmp->members) { \ - DP("out of memory for %lu bytes", hashsize * sizeof(dtype));\ + DP("out of memory for %zu bytes", hashsize * sizeof(dtype));\ kfree(tmp); \ return -ENOMEM; \ } \ @@ -109,7 +109,7 @@ type##_create(struct ip_set *set, const void *data, u_int32_t size) \ map = kmalloc(sizeof(struct ip_set_##type) \ + req->probes * sizeof(initval_t), GFP_KERNEL); \ if (!map) { \ - DP("out of memory for %lu bytes", \ + DP("out of memory for %zu bytes", \ sizeof(struct ip_set_##type) \ + req->probes * sizeof(initval_t)); \ return -ENOMEM; \ @@ -126,7 +126,7 @@ type##_create(struct ip_set *set, const void *data, u_int32_t size) \ } \ map->members = harray_malloc(map->hashsize, sizeof(dtype), GFP_KERNEL);\ if (!map->members) { \ - DP("out of memory for %lu bytes", map->hashsize * sizeof(dtype));\ + DP("out of memory for %zu bytes", map->hashsize * sizeof(dtype));\ kfree(map); \ return -ENOMEM; \ } \ diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_malloc.h b/kernel/include/linux/netfilter_ipv4/ip_set_malloc.h index 8bce667..2a80443 100644 --- a/kernel/include/linux/netfilter_ipv4/ip_set_malloc.h +++ b/kernel/include/linux/netfilter_ipv4/ip_set_malloc.h @@ -40,7 +40,7 @@ struct harray { }; static inline void * -__harray_malloc(size_t hashsize, size_t typesize, int flags) +__harray_malloc(size_t hashsize, size_t typesize, gfp_t flags) { struct harray *harray; size_t max_elements, size, i, j; @@ -88,7 +88,7 @@ __harray_malloc(size_t hashsize, size_t typesize, int flags) } static inline void * -harray_malloc(size_t hashsize, size_t typesize, int flags) +harray_malloc(size_t hashsize, size_t typesize, gfp_t flags) { void *harray; |