From: Simon Horman <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>
Subject: [PATCH 3/7] ipvs: Use config macro IS_ENABLED()
Date: Fri, 28 Sep 2012 11:55:00 +0900 [thread overview]
Message-ID: <1348800904-23902-4-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1348800904-23902-1-git-send-email-horms@verge.net.au>
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 */
--
1.7.10.4
next prev parent reply other threads:[~2012-09-28 2:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-28 2:54 [GIT PULL nf-next] IPVS for 3.7 #2 Simon Horman
2012-09-28 2:54 ` [PATCH 1/7] ipvs: Trivial changes, use compressed IPv6 address in output Simon Horman
2012-09-28 2:54 ` [PATCH 2/7] ipvs: IPv6 extend ICMPv6 handling for future types Simon Horman
2012-09-28 2:55 ` Simon Horman [this message]
2012-09-28 2:55 ` [PATCH 4/7] ipvs: Fix faulty IPv6 extension header handling in IPVS Simon Horman
2012-09-28 2:55 ` [PATCH 5/7] ipvs: Complete IPv6 fragment handling for IPVS Simon Horman
2012-09-28 2:55 ` [PATCH 6/7] ipvs: API change to avoid rescan of IPv6 exthdr Simon Horman
2012-09-28 2:55 ` [PATCH 7/7] ipvs: SIP fragment handling Simon Horman
2012-10-08 18:44 ` [GIT PULL nf-next] IPVS for 3.7 #2 Jesper Dangaard Brouer
2012-10-08 23:17 ` Pablo Neira Ayuso
2012-10-09 3:52 ` Simon Horman
2012-10-22 10:55 ` Pablo Neira Ayuso
2012-10-22 11:53 ` Jesper Dangaard Brouer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348800904-23902-4-git-send-email-horms@verge.net.au \
--to=horms@verge.net.au \
--cc=brouer@redhat.com \
--cc=hans.schillstrom@ericsson.com \
--cc=hans@schillstrom.com \
--cc=ja@ssi.bg \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=wensong@linux-vs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).