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

Commit 01125379 authored by Florian Westphal's avatar Florian Westphal Committed by Greg Kroah-Hartman
Browse files

netfilter: nf_tables: fix ifdef to also consider nf_tables=m 



[ Upstream commit c55c0e91c813589dc55bea6bf9a9fbfaa10ae41d ]

nftables can be built as a module, so fix the preprocessor conditional
accordingly.

Fixes: 478b360a ("netfilter: nf_tables: fix nf_trace always-on with XT_TRACE=n")
Reported-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reported-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7c101939

include/linux/skbuff.h

+2 −2
Original line number Diff line number Diff line
@@ -4227,7 +4227,7 @@ static inline void nf_reset_ct(struct sk_buff *skb) 


static inline void nf_reset_trace(struct sk_buff *skb)

{

#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || defined(CONFIG_NF_TABLES)

#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || IS_ENABLED(CONFIG_NF_TABLES)

	skb->nf_trace = 0;

#endif

}
@@ -4247,7 +4247,7 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src, 
	dst->_nfct = src->_nfct;

	nf_conntrack_get(skb_nfct(src));

#endif

#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || defined(CONFIG_NF_TABLES)

#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || IS_ENABLED(CONFIG_NF_TABLES)

	if (copy)

		dst->nf_trace = src->nf_trace;

#endif