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/include/linux/netfilter | |
| 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/include/linux/netfilter')
| -rw-r--r-- | kernel/include/linux/netfilter/ip_set.h | 1 | ||||
| -rw-r--r-- | kernel/include/linux/netfilter/ip_set_kernel.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/kernel/include/linux/netfilter/ip_set.h b/kernel/include/linux/netfilter/ip_set.h index f306859..b83454a 100644 --- a/kernel/include/linux/netfilter/ip_set.h +++ b/kernel/include/linux/netfilter/ip_set.h @@ -155,6 +155,7 @@ enum ipset_adt { #include <linux/ip.h> #include <linux/ipv6.h> #include <linux/netlink.h> +#include <linux/vmalloc.h> #include <net/netlink.h> /* Sets are identified by an index in kernel space. Tweak with ip_set_id_t diff --git a/kernel/include/linux/netfilter/ip_set_kernel.h b/kernel/include/linux/netfilter/ip_set_kernel.h index d6e033b..0f04217 100644 --- a/kernel/include/linux/netfilter/ip_set_kernel.h +++ b/kernel/include/linux/netfilter/ip_set_kernel.h @@ -10,8 +10,10 @@ #ifdef __KERNEL__ +#ifdef CONFIG_DEBUG_KERNEL /* Complete debug messages */ #define pr_fmt(fmt) "%s %s[%i]: " fmt "\n", __FILE__, __func__, __LINE__ +#endif #include <linux/kernel.h> |