summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2009-08-21 16:03:50 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2009-08-21 16:03:50 +0200
commit91d4031f78382a4cd5cf8666c7f985e2728e8578 (patch)
tree36f66537165177bab53847c482bab23399b09504 /kernel
parentb1eb3639064583758c56a98850b4efec5e9fc165 (diff)
New release again, to fix a mistyping of me and get rid of bool.v3.2
Diffstat (limited to 'kernel')
-rw-r--r--kernel/ChangeLog4
-rw-r--r--kernel/ip_set_iptree.c2
-rw-r--r--kernel/ip_set_setlist.c9
3 files changed, 7 insertions, 8 deletions
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index fd440ef..f0c3616 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,7 @@
+3.2
+ - Mixed up formats in ip_set_iptree.c (Rob Sterenborg)
+ - Don't use 'bool' for backward compatibility reasons (Rob Sterenborg)
+
3.1
- Nonexistent sets were reported as existing sets when testing
from userspace in setlist type of sets (bug reported by Victor A.
diff --git a/kernel/ip_set_iptree.c b/kernel/ip_set_iptree.c
index f7d64b7..1ef8263 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 %zu)",
+ ip_set_printk("data length wrong (want %zu, have %lu)",
sizeof(struct ip_set_req_iptree_create),
(unsigned long)size);
return -EINVAL;
diff --git a/kernel/ip_set_setlist.c b/kernel/ip_set_setlist.c
index 612f81f..2b1c6b6 100644
--- a/kernel/ip_set_setlist.c
+++ b/kernel/ip_set_setlist.c
@@ -16,17 +16,12 @@
#include <linux/netfilter_ipv4/ip_set_bitmaps.h>
#include <linux/netfilter_ipv4/ip_set_setlist.h>
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)
-typedef _Bool bool;
-enum { false = 0, true = 1, };
-#endif
-
/*
* before ==> index, ref
* after ==> ref, index
*/
-static inline bool
+static inline int
next_index_eq(const struct ip_set_setlist *map, int i, ip_set_id_t index)
{
return i < map->size && map->index[i] == index;
@@ -175,7 +170,7 @@ setlist_kadd(struct ip_set *set,
return res;
}
-static inline bool
+static inline int
unshift_setlist(struct ip_set_setlist *map, int i)
{
int j;