From 35783b5c51d079439b737053e2ab88c2eb9ccea7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 7 Jul 2008 11:07:15 +0200 Subject: [PATCH] ipset: fixup compile errors with 2.6.18.x and 2.6.20 warnings --- extensions/ipset/ip_set_iptree.c | 2 +- extensions/ipset/ip_set_iptreemap.c | 2 +- extensions/ipset/ip_set_malloc.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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;