summaryrefslogtreecommitdiffstats
path: root/ipset.c
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2009-08-18 19:52:26 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2009-08-18 19:52:26 +0200
commitd19f4ca4451f02add0e8edfcb69882d5b3e0cc9e (patch)
treee865cb32f704306dcc20e7fe47245ab91663b67b /ipset.c
parent027dc5fb9021ce3f814a345b17c56d899733569a (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.c')
-rw-r--r--ipset.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipset.c b/ipset.c
index de6a4ec..5ff32cf 100644
--- a/ipset.c
+++ b/ipset.c
@@ -1577,7 +1577,7 @@ static int set_adtip(struct set *set, const char *adt,
/* Alloc memory for the data to send */
size = sizeof(struct ip_set_req_adt) + set->settype->adt_size ;
- DP("alloc size %i", size);
+ DP("alloc size %d", size);
data = ipset_malloc(size);
/* Fill out the request */
@@ -1663,7 +1663,7 @@ static int set_bind(struct set *set, const char *adt,
size += IP_SET_MAXNAMELEN;
else if (!(op == IP_SET_OP_UNBIND_SET && set == NULL))
size += set->settype->adt_size;
- DP("alloc size %i", size);
+ DP("alloc size %d", size);
data = ipset_malloc(size);
/* Fill out the request */