From a96e4fca10506462df4ee4035f0f86f09bd9dc34 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu" Date: Mon, 20 Oct 2008 10:00:26 +0000 Subject: ipset 2.4 release userspace changes: - Added KBUILD_OUTPUT support (Sven Wegener) - Fix memory leak in ipset_iptreemap (Sven Wegener) - Fix multiple compiler warnings (Sven Wegener) - ipportiphash, ipportnethash and setlist types added - binding marked as deprecated functionality - element separator token changed to ',' in anticipating IPv6 addresses, old separator tokens are still supported - unnecessary includes removed - ipset does not try to resolve IP addresses when listing the content of sets (default changed) - manpage updated - ChangeLog forked for kernel part kernel part changes: - ipportiphash, ipportnethash and setlist types added - set type modules reworked to avoid code duplication as much as possible, code unification macros - expand_macros Makefile target added to help debugging code unification macros - ip_set_addip_kernel and ip_set_delip_kernel changed from void to int, __ip_set_get_byname and __ip_set_put_byid added for the sake of setlist type - unnecessary includes removed - compatibility fix for kernels >= 2.6.27: semaphore.h was moved from asm/ to linux/ (James King) - ChangeLog forked for kernel part --- kernel/include/linux/netfilter_ipv4/ip_set_malloc.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'kernel/include/linux/netfilter_ipv4/ip_set_malloc.h') diff --git a/kernel/include/linux/netfilter_ipv4/ip_set_malloc.h b/kernel/include/linux/netfilter_ipv4/ip_set_malloc.h index d22bed7..8bce667 100644 --- a/kernel/include/linux/netfilter_ipv4/ip_set_malloc.h +++ b/kernel/include/linux/netfilter_ipv4/ip_set_malloc.h @@ -2,8 +2,10 @@ #define _IP_SET_MALLOC_H #ifdef __KERNEL__ +#include static size_t max_malloc_size = 0, max_page_size = 0; +static size_t default_max_malloc_size = 131072; /* Guaranteed: slab.c */ static inline int init_max_page_size(void) { @@ -12,7 +14,7 @@ static inline int init_max_page_size(void) #define __GFP_NOWARN 0 /* Guaranteed: slab.c */ - max_malloc_size = max_page_size = 131072; + max_malloc_size = max_page_size = default_max_malloc_size; #else size_t page_size = 0; @@ -130,7 +132,7 @@ static inline void * ip_set_malloc(size_t bytes) { BUG_ON(max_malloc_size == 0); - if (bytes > max_malloc_size) + if (bytes > default_max_malloc_size) return vmalloc(bytes); else return kmalloc(bytes, GFP_KERNEL | __GFP_NOWARN); @@ -140,7 +142,7 @@ static inline void ip_set_free(void * data, size_t bytes) { BUG_ON(max_malloc_size == 0); - if (bytes > max_malloc_size) + if (bytes > default_max_malloc_size) vfree(data); else kfree(data); -- cgit v1.2.3