| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20120926120616.24804.45927.stgit@dragon> Date: Wed, 26 Sep 2012 14:06:20 +0200 From: Jesper Dangaard Brouer <brouer@...hat.com> To: Hans Schillstrom <hans@...illstrom.com>, Hans Schillstrom <hans.schillstrom@...csson.com>, netdev@...r.kernel.org, Pablo Neira Ayuso <pablo@...filter.org>, lvs-devel@...r.kernel.org, Julian Anastasov <ja@....bg> Cc: Jesper Dangaard Brouer <brouer@...hat.com>, "Patrick McHardy" <kaber@...sh.net>, Thomas Graf <tgraf@...g.ch>, Wensong Zhang <wensong@...ux-vs.org>, netfilter-devel@...r.kernel.org, Simon Horman <horms@...ge.net.au> Subject: [PATCH V4 3/7] 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@...hat.com> --- include/net/ip_vs.h | 2 +- 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 */ -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists