tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

netfilter: conntrack: Remove unused function declarations

Commit 1015c3de23ee ("netfilter: conntrack: remove extension register api")
leave nf_conntrack_acct_fini() and nf_conntrack_labels_init() unused, remove it.
And commit a0ae2562c6c4 ("netfilter: conntrack: remove l3proto abstraction")
leave behind nf_ct_l3proto_try_module_get() and nf_ct_l3proto_module_put().

Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Florian Westphal <fw@strlen.de>

authored by

Yue Haibing and committed by
Florian Westphal 172af3ea 529f63fa

-7
-4
include/net/netfilter/nf_conntrack.h
··· 190 190 nf_ct_destroy(&ct->ct_general); 191 191 } 192 192 193 - /* Protocol module loading */ 194 - int nf_ct_l3proto_try_module_get(unsigned short l3proto); 195 - void nf_ct_l3proto_module_put(unsigned short l3proto); 196 - 197 193 /* load module; enable/disable conntrack in this namespace */ 198 194 int nf_ct_netns_get(struct net *net, u8 nfproto); 199 195 void nf_ct_netns_put(struct net *net, u8 nfproto);
-2
include/net/netfilter/nf_conntrack_acct.h
··· 78 78 79 79 void nf_conntrack_acct_pernet_init(struct net *net); 80 80 81 - void nf_conntrack_acct_fini(void); 82 - 83 81 #endif /* _NF_CONNTRACK_ACCT_H */
-1
include/net/netfilter/nf_conntrack_labels.h
··· 52 52 const u32 *data, const u32 *mask, unsigned int words); 53 53 54 54 #ifdef CONFIG_NF_CONNTRACK_LABELS 55 - int nf_conntrack_labels_init(void); 56 55 int nf_connlabels_get(struct net *net, unsigned int bit); 57 56 void nf_connlabels_put(struct net *net); 58 57 #else