diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-10-08 21:16:01 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2013-10-08 21:16:01 +0200 |
| commit | 1ba17771f624fb3b3fa5526b31c578f6d79b09df (patch) | |
| tree | f1937d1bfa5d2587dc6cf6b7f6878ff60653db38 /kernel | |
| parent | 864a7f592000fd29e7ff56e2790aff632e85a5b1 (diff) | |
Avoid clashing with configured kernel in [CONFIG_]IP_SET_MAX
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_compat.h.in | 8 | ||||
| -rw-r--r-- | kernel/net/netfilter/ipset/Kbuild | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in index b93c5d9..ce4d922 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in @@ -1,6 +1,14 @@ #ifndef __IP_SET_COMPAT_H #define __IP_SET_COMPAT_H +#ifndef CONFIG_IP_SET_MAX +#ifdef IP_SET_MAX +#define CONFIG_IP_SET_MAX IP_SET_MAX +#else +#define CONFIG_IP_SET_MAX 256 +#endif +#endif + #@HAVE_STRUCT_XT_ACTION_PARAM@ HAVE_STRUCT_XT_ACTION_PARAM #@HAVE_VZALLOC@ HAVE_VZALLOC #@HAVE_ETHER_ADDR_EQUAL@ HAVE_ETHER_ADDR_EQUAL diff --git a/kernel/net/netfilter/ipset/Kbuild b/kernel/net/netfilter/ipset/Kbuild index dc5cc05..5564cb5 100644 --- a/kernel/net/netfilter/ipset/Kbuild +++ b/kernel/net/netfilter/ipset/Kbuild @@ -1,5 +1,5 @@ NOSTDINC_FLAGS += -I$(KDIR)/include -EXTRA_CFLAGS := -DCONFIG_IP_SET_MAX=$(IP_SET_MAX) +EXTRA_CFLAGS := -DIP_SET_MAX=$(IP_SET_MAX) ip_set-y := ip_set_core.o ip_set_getport.o pfxlen.o obj-m += ip_set.o |