| 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: <1348800904-23902-4-git-send-email-horms@verge.net.au> Date: Fri, 28 Sep 2012 11:55:00 +0900 From: Simon Horman <horms@...ge.net.au> To: Pablo Neira Ayuso <pablo@...filter.org> Cc: lvs-devel@...r.kernel.org, netdev@...r.kernel.org, netfilter-devel@...r.kernel.org, Wensong Zhang <wensong@...ux-vs.org>, Julian Anastasov <ja@....bg>, Hans Schillstrom <hans.schillstrom@...csson.com>, Hans Schillstrom <hans@...illstrom.com>, Jesper Dangaard Brouer <brouer@...hat.com>, Simon Horman <horms@...ge.net.au> Subject: [PATCH 3/7] ipvs: Use config macro IS_ENABLED() From: Jesper Dangaard Brouer <brouer@...hat.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@...hat.com> Acked-by: Julian Anastasov <ja@....bg> Signed-off-by: Simon Horman <horms@...ge.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 -- 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