From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Tue, 6 Sep 2011 19:25:10 +0000 (+0200)
Subject: Fix compiling ipset as external kernel modules
X-Git-Tag: v6.9.1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8fd5942549452828cf8632928427c1420efa919;p=ipset

Fix compiling ipset as external kernel modules
---

diff --git a/kernel/net/netfilter/ipset/Kbuild b/kernel/net/netfilter/ipset/Kbuild
index a04bb64..390ec1e 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 := -DCONFIG_IP_SET_MAX=$(IP_SET_MAX) -DIPSET_EXTERNAL_MODULE
 
 ip_set-y := ip_set_core.o ip_set_getport.o pfxlen.o
 obj-m += ip_set.o
diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
index e9169e8..0fe43a1 100644
--- a/kernel/net/netfilter/ipset/ip_set_core.c
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
@@ -17,7 +17,7 @@
 #include <linux/spinlock.h>
 #include <linux/netlink.h>
 #include <linux/rculist.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(99, 99, 99)
+#ifdef IPSET_EXTERNAL_MODULE
 #include <linux/version.h>
 #endif
 #include <net/netlink.h>