Skip to content

Commit c55c0e9

Browse files
Florian Westphalummakynes
authored andcommitted
netfilter: nf_tables: fix ifdef to also consider nf_tables=m
nftables can be built as a module, so fix the preprocessor conditional accordingly. Fixes: 478b360 ("netfilter: nf_tables: fix nf_trace always-on with XT_TRACE=n") Reported-by: Florian Fainelli <[email protected]> Reported-by: Jakub Kicinski <[email protected]> Signed-off-by: Florian Westphal <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent af0acf2 commit c55c0e9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/linux/skbuff.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4713,7 +4713,7 @@ static inline void nf_reset_ct(struct sk_buff *skb)
47134713

47144714
static inline void nf_reset_trace(struct sk_buff *skb)
47154715
{
4716-
#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || defined(CONFIG_NF_TABLES)
4716+
#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || IS_ENABLED(CONFIG_NF_TABLES)
47174717
skb->nf_trace = 0;
47184718
#endif
47194719
}
@@ -4733,7 +4733,7 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src,
47334733
dst->_nfct = src->_nfct;
47344734
nf_conntrack_get(skb_nfct(src));
47354735
#endif
4736-
#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || defined(CONFIG_NF_TABLES)
4736+
#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || IS_ENABLED(CONFIG_NF_TABLES)
47374737
if (copy)
47384738
dst->nf_trace = src->nf_trace;
47394739
#endif

0 commit comments

Comments
 (0)