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 82ed54b255a254dd2bddaf9e8f234121e5a6960c..5170294906ed69c59b142eb49f4eca2ca41fea16 100644 (file)
--- 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 4c4cc9717005c9daba73006626902af033a37fa6..bc102fc4be6b9c97693a1302d1303d5f3abca82e 100644 (file)
--- 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 30701f44641136d04a19f1a4cec3fb2aeed4a59f..ddf6389ad09e8bc08dce2ffb9ad46f489fe71b06 100644 (file)
--- 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;