Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0165888 authored by Gao feng's avatar Gao feng Committed by Pablo Neira Ayuso
Browse files

netfilter: use IS_ENABLE to replace if defined in TRACE target 



Signed-off-by: default avatarGao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ac69269a

net/ipv4/ip_output.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

net/ipv4/netfilter/ip_tables.c

+2 −4
Original line number Diff line number Diff line
@@ -182,8 +182,7 @@ ipt_get_target_c(const struct ipt_entry *e) 
	return ipt_get_target((struct ipt_entry *)e);

}



#if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \

    defined(CONFIG_NETFILTER_XT_TARGET_TRACE_MODULE)

#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)

static const char *const hooknames[] = {

	[NF_INET_PRE_ROUTING]		= "PREROUTING",

	[NF_INET_LOCAL_IN]		= "INPUT",
@@ -361,8 +360,7 @@ ipt_do_table(struct sk_buff *skb, 
		t = ipt_get_target(e);

		IP_NF_ASSERT(t->u.kernel.target);



#if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \

    defined(CONFIG_NETFILTER_XT_TARGET_TRACE_MODULE)

#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)

		/* The packet is traced: log it */

		if (unlikely(skb->nf_trace))

			trace_packet(skb, hook, in, out,