Commit 6e116280 authored by Kumar Kartikeya Dwivedi's avatar Kumar Kartikeya Dwivedi Committed by Alexei Starovoitov
Browse files

net: netfilter: Remove ifdefs for code shared by BPF and ctnetlink 



The current ifdefry for code shared by the BPF and ctnetlink side looks
ugly. As per Pablo's request, simplify this by unconditionally compiling
in the code. This can be revisited when the shared code between the two
grows further.

Suggested-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20220725085130.11553-1-memxor@gmail.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent be3bb83d

include/net/netfilter/nf_conntrack_core.h

+0 −6
Original line number Diff line number Diff line
@@ -86,10 +86,6 @@ extern spinlock_t nf_conntrack_expect_lock; 


/* ctnetlink code shared by both ctnetlink and nf_conntrack_bpf */



#if (IS_BUILTIN(CONFIG_NF_CONNTRACK) && IS_ENABLED(CONFIG_DEBUG_INFO_BTF)) || \

    (IS_MODULE(CONFIG_NF_CONNTRACK) && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES) || \

    IS_ENABLED(CONFIG_NF_CT_NETLINK))



static inline void __nf_ct_set_timeout(struct nf_conn *ct, u64 timeout)

{

	if (timeout > INT_MAX)
@@ -101,6 +97,4 @@ int __nf_ct_change_timeout(struct nf_conn *ct, u64 cta_timeout); 
void __nf_ct_change_status(struct nf_conn *ct, unsigned long on, unsigned long off);

int nf_ct_change_status_common(struct nf_conn *ct, unsigned int status);



#endif



#endif /* _NF_CONNTRACK_CORE_H */

net/netfilter/nf_conntrack_core.c

+0 −6
Original line number Diff line number Diff line
@@ -2807,10 +2807,6 @@ int nf_conntrack_init_net(struct net *net) 
	return ret;

}



#if (IS_BUILTIN(CONFIG_NF_CONNTRACK) && IS_ENABLED(CONFIG_DEBUG_INFO_BTF)) || \

    (IS_MODULE(CONFIG_NF_CONNTRACK) && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES) || \

    IS_ENABLED(CONFIG_NF_CT_NETLINK))



/* ctnetlink code shared by both ctnetlink and nf_conntrack_bpf */



int __nf_ct_change_timeout(struct nf_conn *ct, u64 timeout)
@@ -2866,5 +2862,3 @@ int nf_ct_change_status_common(struct nf_conn *ct, unsigned int status) 
	return 0;

}

EXPORT_SYMBOL_GPL(nf_ct_change_status_common);
 


#endif