ipset: fast forward to 3.0

This commit is contained in:
Jan Engelhardt
2009-05-27 14:49:39 +02:00
parent 49e59a6dce
commit 77ee63ba8b
28 changed files with 133 additions and 129 deletions

View File

@@ -276,21 +276,21 @@ init_gc_timer(struct ip_set *set)
}
static int
iptree_create(struct ip_set *set, const void *data, size_t size)
iptree_create(struct ip_set *set, const void *data, u_int32_t size)
{
const struct ip_set_req_iptree_create *req = data;
struct ip_set_iptree *map;
if (size != sizeof(struct ip_set_req_iptree_create)) {
ip_set_printk("data length wrong (want %zu, have %zu)",
ip_set_printk("data length wrong (want %zu, have %lu)",
sizeof(struct ip_set_req_iptree_create),
size);
(unsigned long)size);
return -EINVAL;
}
map = kmalloc(sizeof(struct ip_set_iptree), GFP_KERNEL);
if (!map) {
DP("out of memory for %d bytes",
DP("out of memory for %zu bytes",
sizeof(struct ip_set_iptree));
return -ENOMEM;
}