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/Kconfig.ipset | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'kernel/Kconfig.ipset') diff --git a/kernel/Kconfig.ipset b/kernel/Kconfig.ipset index 2c6022a..8b27517 100644 --- a/kernel/Kconfig.ipset +++ b/kernel/Kconfig.ipset @@ -79,6 +79,22 @@ config IP_NF_SET_IPPORTHASH To compile it as a module, choose M here. If unsure, say N. +config IP_NF_SET_IPPORTIPHASH + tristate "ipportiphash set support" + depends on IP_NF_SET + help + This option adds the ipportiphash set type support. + + To compile it as a module, choose M here. If unsure, say N. + +config IP_NF_SET_IPPORTNETHASH + tristate "ipportnethash set support" + depends on IP_NF_SET + help + This option adds the ipportnethash set type support. + + To compile it as a module, choose M here. If unsure, say N. + config IP_NF_SET_IPTREE tristate "iptree set support" depends on IP_NF_SET @@ -95,6 +111,14 @@ config IP_NF_SET_IPTREEMAP To compile it as a module, choose M here. If unsure, say N. +config IP_NF_SET_SETLIST + tristate "setlist set support" + depends on IP_NF_SET + help + This option adds the setlist set type support. + + To compile it as a module, choose M here. If unsure, say N. + config IP_NF_MATCH_SET tristate "set match support" depends on IP_NF_SET -- cgit v1.2.3