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/ip_set_iptree.c | |
| 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/ip_set_iptree.c')
| -rw-r--r-- | kernel/ip_set_iptree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/ip_set_iptree.c b/kernel/ip_set_iptree.c index 08b9118..f7d64b7 100644 --- a/kernel/ip_set_iptree.c +++ b/kernel/ip_set_iptree.c @@ -282,7 +282,7 @@ iptree_create(struct ip_set *set, const void *data, u_int32_t size) struct ip_set_iptree *map; if (size != sizeof(struct ip_set_req_iptree_create)) { - ip_set_printk("data length wrong (want %lu, have %lu)", + ip_set_printk("data length wrong (want %lu, have %zu)", sizeof(struct ip_set_req_iptree_create), (unsigned long)size); return -EINVAL; @@ -290,7 +290,7 @@ iptree_create(struct ip_set *set, const void *data, u_int32_t size) map = kmalloc(sizeof(struct ip_set_iptree), GFP_KERNEL); if (!map) { - DP("out of memory for %lu bytes", + DP("out of memory for %zu bytes", sizeof(struct ip_set_iptree)); return -ENOMEM; } |