From patchwork Fri Sep 28 02:55:00 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [3/7] ipvs: Use config macro IS_ENABLED()
From: Simon Horman <horms@verge.net.au>
X-Patchwork-Id: 187699
Message-Id: <1348800904-23902-4-git-send-email-horms@verge.net.au>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: lvs-devel@vger.kernel.org, netdev@vger.kernel.org,
 netfilter-devel@vger.kernel.org, Wensong Zhang <wensong@linux-vs.org>,
 Julian Anastasov <ja@ssi.bg>,
 Hans Schillstrom <hans.schillstrom@ericsson.com>,
 Hans Schillstrom <hans@schillstrom.com>,
 Jesper Dangaard Brouer <brouer@redhat.com>,
 Simon Horman <horms@verge.net.au>
Date: Fri, 28 Sep 2012 11:55:00 +0900

From: Jesper Dangaard Brouer <brouer@redhat.com>

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>

---
include/net/ip_vs.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 */