diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-09-15 21:00:22 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-09-15 21:00:22 +0200 |
| commit | 520e3d923a5689e3c0a3702406971a6f89726199 (patch) | |
| tree | 83b866577e335a71b44c97ab252d15addf018ae4 | |
| parent | a3174753ff6582ba89368c76c98ecc24c0207152 (diff) | |
Invert the logic to include version.h in ip_set_core.c
| -rw-r--r-- | kernel/net/netfilter/ipset/Kbuild | 2 | ||||
| -rw-r--r-- | kernel/net/netfilter/ipset/ip_set_core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/net/netfilter/ipset/Kbuild b/kernel/net/netfilter/ipset/Kbuild index 390ec1e..a04bb64 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) -DIPSET_EXTERNAL_MODULE +EXTRA_CFLAGS := -DCONFIG_IP_SET_MAX=$(IP_SET_MAX) 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 0fe43a1..c980329 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> -#ifdef IPSET_EXTERNAL_MODULE +#ifndef IPSET_IN_KERNEL_TREE #include <linux/version.h> #endif #include <net/netlink.h> |