commit f0165888610a1701a39670c7eadf63a61fad708d
author Gao feng <gaofeng@cn.fujitsu.com> Thu Mar 21 19:48:42 2013 +0000
committer Pablo Neira Ayuso <pablo@netfilter.org> Tue Apr 02 01:03:45 2013 +0200
tree b1bb334c2d5c2dfe61f51122cfae2b11530b1ea1
parent ac69269a45e84c1772dcb9e77db976a932f4af22

netfilter: use IS_ENABLE to replace if defined in TRACE target

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

net/ipv4/ip_output.c

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 5e12dca..147abf5 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -430,8 +430,7 @@
 	to->tc_index = from->tc_index;
 #endif
 	nf_copy(to, from);
-#if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
-    defined(CONFIG_NETFILTER_XT_TARGET_TRACE_MODULE)
+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
 	to->nf_trace = from->nf_trace;
 #endif
 #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)