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 /ipset_ipmap.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 'ipset_ipmap.c')
| -rw-r--r-- | ipset_ipmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipset_ipmap.c b/ipset_ipmap.c index 287b057..992a862 100644 --- a/ipset_ipmap.c +++ b/ipset_ipmap.c @@ -225,12 +225,12 @@ initheader(struct set *set, const void *data) mask = range_to_mask(header->from, header->to, &mask_bits); netmask_bits = mask_to_bits(header->netmask); - DP("bits: %i %i", mask_bits, netmask_bits); + DP("bits: %d %d", mask_bits, netmask_bits); map->hosts = 2 << (32 - netmask_bits - 1); map->sizeid = 2 << (netmask_bits - mask_bits - 1); } - DP("%i %i", map->hosts, map->sizeid ); + DP("%d %d", map->hosts, map->sizeid ); } static void |