diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-06-29 21:14:40 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2010-06-29 21:14:40 +0200 |
| commit | 8dd10256cb24ceade8b40bd1604f03ddac8589e2 (patch) | |
| tree | 9b6e5deae0b5d349122c82b63019d6bb36a66aeb /kernel/Kconfig.ipset | |
| parent | 780f6384c5c6639da3f5a6ac8d30653e8a26d6c0 (diff) | |
ipset 5: Sparc related and compatibility fixesv5.0-pre5
ipset 5 is tested on Sparc, which revealed some compatibility issues
and those are fixed. Kernels from 2.6.31 onward are supported.
The testsuite checkings are completed to run match/target checks.
The README file is updated to reflect the requirements to install
and run ipset 5.
Diffstat (limited to 'kernel/Kconfig.ipset')
| -rw-r--r-- | kernel/Kconfig.ipset | 74 |
1 files changed, 29 insertions, 45 deletions
diff --git a/kernel/Kconfig.ipset b/kernel/Kconfig.ipset index 7f7a34a..527b294 100644 --- a/kernel/Kconfig.ipset +++ b/kernel/Kconfig.ipset @@ -20,95 +20,79 @@ config IP_SET_MAX The value can be overriden by the 'max_sets' module parameter of the 'ip_set' module. -config IP_SET_IPMAP - tristate "ipmap set support" +config IP_SET_BITMAP_IP + tristate "bitmap:ip set support" depends on IP_SET help - This option adds the ipmap set type support. + This option adds the bitmap:ip set type support. To compile it as a module, choose M here. If unsure, say N. -config IP_SET_MACIPMAP - tristate "macipmap set support" +config IP_SET_BITMAP_IPMAC + tristate "bitmap:ip,mac set support" depends on IP_SET help - This option adds the macipmap set type support. + This option adds the bitmap:ip,mac set type support. To compile it as a module, choose M here. If unsure, say N. -config IP_SET_PORTMAP - tristate "portmap set support" +config IP_SET_BITMAP_PORT + tristate "bitmap:port set support" depends on IP_SET help - This option adds the portmap set type support. + This option adds the bitmap:port set type support. To compile it as a module, choose M here. If unsure, say N. -config IP_SET_IPHASH - tristate "iphash set support" +config IP_SET_HASH_IP + tristate "hash:ip set support" depends on IP_SET help - This option adds the iphash set type support. + This option adds the hash:ip set type support. To compile it as a module, choose M here. If unsure, say N. -config IP_SET_NETHASH - tristate "nethash set support" +config IP_SET_HASH_NET + tristate "hash:net set support" depends on IP_SET help - This option adds the nethash set type support. + This option adds the hash:net set type support. To compile it as a module, choose M here. If unsure, say N. -config IP_SET_IPPORTHASH - tristate "ipporthash set support" +config IP_SET_HASH_IPPORT + tristate "hash:ip,port set support" depends on IP_SET help - This option adds the ipporthash set type support. + This option adds the hash:ip,port set type support. To compile it as a module, choose M here. If unsure, say N. -config IP_SET_IPPORTIPHASH - tristate "ipportiphash set support" +config IP_SET_HASH_IPPORTIP + tristate "hash:ip,port,ip set support" depends on IP_SET help - This option adds the ipportiphash set type support. + This option adds the hash:ip,port,ip set type support. To compile it as a module, choose M here. If unsure, say N. -config IP_SET_IPPORTNETHASH - tristate "ipportnethash set support" +config IP_SET_HASH_IPPORTNET + tristate "hash:ip,port,net set support" depends on IP_SET help - This option adds the ipportnethash set type support. + This option adds the hash:ip,port,net set type support. To compile it as a module, choose M here. If unsure, say N. -config IP_SET_IPTREE - tristate "iptree set support" +config IP_SET_LIST_SET + tristate "list:set set support" depends on IP_SET help - This option adds the iptree set type support. + This option adds the list:set set type support. To compile it as a module, choose M here. If unsure, say N. -config IP_SET_IPTREEMAP - tristate "iptreemap set support" - depends on IP_SET - help - This option adds the iptreemap set type support. - - To compile it as a module, choose M here. If unsure, say N. - -config IP_SET_SETLIST - tristate "setlist set support" - depends on IP_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_MATCH_SET +config NETFILTER_XT_MATCH_SET tristate "set match support" depends on IP_SET help @@ -117,7 +101,7 @@ config IP_MATCH_SET To compile it as a module, choose M here. If unsure, say N. -config IP_TARGET_SET +config NETFILTER_XT_TARGET_SET tristate "SET target support" depends on IP_SET help |