summaryrefslogtreecommitdiffstats
path: root/include/net/ip_vs.h
diff options
context:
space:
mode:
authorJesper Dangaard Brouer <brouer@redhat.com>2012-09-26 14:06:20 +0200
committerSimon Horman <horms@verge.net.au>2012-09-28 11:34:05 +0900
commita638e51437f5efd00c4579df56cfd4d497ed51a8 (patch)
tree76252c98c18afa94a39ca8d18ca9f8c342dae2a6 /include/net/ip_vs.h
parent2fab8917f480942c43275e231c0647838e02dc2b (diff)
downloadop-kernel-dev-a638e51437f5efd00c4579df56cfd4d497ed51a8.zip
op-kernel-dev-a638e51437f5efd00c4579df56cfd4d497ed51a8.tar.gz
ipvs: Use config macro IS_ENABLED()
Cleanup patch. Use the IS_ENABLED macro, instead of having to check both the build and the module CONFIG_ option. Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Acked-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'include/net/ip_vs.h')
-rw-r--r--include/net/ip_vs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index aba0bb2..c8b2bdb 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -22,7 +22,7 @@
#include <linux/ip.h>
#include <linux/ipv6.h> /* for struct ipv6hdr */
#include <net/ipv6.h>
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+#if IS_ENABLED(CONFIG_NF_CONNTRACK)
#include <net/netfilter/nf_conntrack.h>
#endif
#include <net/net_namespace.h> /* Netw namespace */
OpenPOWER on IntegriCloud