summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-09-06 21:25:10 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-09-06 21:25:53 +0200
commitb8fd5942549452828cf8632928427c1420efa919 (patch)
treeb1905ce9514ad4080176c512b3f3df25773997a9 /kernel
parentc18c7e8b5d75b30f0f2cbb7b1a9d90905eb135ed (diff)
Fix compiling ipset as external kernel modules
Diffstat (limited to 'kernel')
-rw-r--r--kernel/net/netfilter/ipset/Kbuild2
-rw-r--r--kernel/net/netfilter/ipset/ip_set_core.c2
2 files changed, 2 insertions, 2 deletions
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>