From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Tue, 8 Oct 2013 19:16:01 +0000 (+0200)
Subject: Avoid clashing with configured kernel in [CONFIG_]IP_SET_MAX
X-Git-Tag: v6.20.1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ba17771f624fb3b3fa5526b31c578f6d79b09df;p=ipset

Avoid clashing with configured kernel in [CONFIG_]IP_SET_MAX
---

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