Fix compiling ipset as external kernel modules

diff --git a/kernel/net/netfilter/ipset/Kbuild b/kernel/net/netfilter/ipset/Kbuild
index a04bb642697ce1bd38107af1b634b940bf0033d1..390ec1efb07dea3dea851d41b738476aa14f6619 100644 (file)
--- 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 e9169e8b52a704ffce66edb19809158e30d651f7..0fe43a1d348d0aa3a08d09e6c92cb6f4a546f9ab 100644 (file)
--- 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>