summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_output.c
diff options
context:
space:
mode:
authorGao feng <gaofeng@cn.fujitsu.com>2013-03-21 19:48:42 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2013-04-02 01:03:45 +0200
commitf0165888610a1701a39670c7eadf63a61fad708d (patch)
treeb1bb334c2d5c2dfe61f51122cfae2b11530b1ea1 /net/ipv4/ip_output.c
parentac69269a45e84c1772dcb9e77db976a932f4af22 (diff)
downloadlinux-f0165888610a1701a39670c7eadf63a61fad708d.tar.gz
linux-f0165888610a1701a39670c7eadf63a61fad708d.tar.bz2
linux-f0165888610a1701a39670c7eadf63a61fad708d.zip
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>
Diffstat (limited to 'net/ipv4/ip_output.c')
-rw-r--r--net/ipv4/ip_output.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 5e12dca7b3dd..147abf5275aa 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -430,8 +430,7 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)
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)