From: Jan Engelhardt <jengelh@medozas.de>
Date: Mon, 7 Jul 2008 09:07:15 +0000 (+0200)
Subject: ipset: fixup compile errors with 2.6.18.x and 2.6.20 warnings
X-Git-Tag: v1.5.5~7^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35783b5c51d079439b737053e2ab88c2eb9ccea7;p=thirdparty%2Fxtables-addons.git

ipset: fixup compile errors with 2.6.18.x and 2.6.20 warnings
---

diff --git a/extensions/ipset/ip_set_iptree.c b/extensions/ipset/ip_set_iptree.c
index 82ed54b..5170294 100644
--- a/extensions/ipset/ip_set_iptree.c
+++ b/extensions/ipset/ip_set_iptree.c
@@ -35,7 +35,7 @@ static int limit = MAX_RANGE;
  * to delete the gc timer at destroying/flushing a set */
 #define IPTREE_DESTROY_SLEEP	100
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
 static struct kmem_cache *branch_cachep;
 static struct kmem_cache *leaf_cachep;
 #else
diff --git a/extensions/ipset/ip_set_iptreemap.c b/extensions/ipset/ip_set_iptreemap.c
index 4c4cc97..bc102fc 100644
--- a/extensions/ipset/ip_set_iptreemap.c
+++ b/extensions/ipset/ip_set_iptreemap.c
@@ -30,7 +30,7 @@
 #define IPTREEMAP_DEFAULT_GC_TIME (5 * 60)
 #define IPTREEMAP_DESTROY_SLEEP (100)
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
 static struct kmem_cache *cachep_b;
 static struct kmem_cache *cachep_c;
 static struct kmem_cache *cachep_d;
diff --git a/extensions/ipset/ip_set_malloc.h b/extensions/ipset/ip_set_malloc.h
index 30701f4..ddf6389 100644
--- a/extensions/ipset/ip_set_malloc.h
+++ b/extensions/ipset/ip_set_malloc.h
@@ -5,7 +5,7 @@
 
 static size_t max_malloc_size = 0, max_page_size = 0;
 
-static inline bool init_max_page_size(void)
+static inline unsigned int init_max_page_size(void)
 {
 	size_t page_size = 0;