diff options
| author | Jesper Dangaard Brouer <brouer@redhat.com> | 2012-09-26 08:06:20 -0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2012-09-27 22:34:05 -0400 |
| commit | a638e51437f5efd00c4579df56cfd4d497ed51a8 (patch) | |
| tree | 76252c98c18afa94a39ca8d18ca9f8c342dae2a6 /include/net/ip_vs.h | |
| parent | 2fab8917f480942c43275e231c0647838e02dc2b (diff) | |
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index aba0bb2da92d..c8b2bdbaf91b 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <linux/ip.h> | 22 | #include <linux/ip.h> |
| 23 | #include <linux/ipv6.h> /* for struct ipv6hdr */ | 23 | #include <linux/ipv6.h> /* for struct ipv6hdr */ |
| 24 | #include <net/ipv6.h> | 24 | #include <net/ipv6.h> |
| 25 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | 25 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) |
| 26 | #include <net/netfilter/nf_conntrack.h> | 26 | #include <net/netfilter/nf_conntrack.h> |
| 27 | #endif | 27 | #endif |
| 28 | #include <net/net_namespace.h> /* Netw namespace */ | 28 | #include <net/net_namespace.h> /* Netw namespace */ |