Commit 172af3ea authored by Yue Haibing's avatar Yue Haibing Committed by Florian Westphal
Browse files

netfilter: conntrack: Remove unused function declarations 



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

Signed-off-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent 529f63fa

include/net/netfilter/nf_conntrack.h

+0 −4
Original line number Diff line number Diff line
@@ -190,10 +190,6 @@ static inline void nf_ct_put(struct nf_conn *ct) 
		nf_ct_destroy(&ct->ct_general);

}



/* Protocol module loading */

int nf_ct_l3proto_try_module_get(unsigned short l3proto);

void nf_ct_l3proto_module_put(unsigned short l3proto);



/* load module; enable/disable conntrack in this namespace */

int nf_ct_netns_get(struct net *net, u8 nfproto);

void nf_ct_netns_put(struct net *net, u8 nfproto);

include/net/netfilter/nf_conntrack_acct.h

+0 −2
Original line number Diff line number Diff line
@@ -78,6 +78,4 @@ static inline void nf_ct_acct_update(struct nf_conn *ct, u32 dir, 


void nf_conntrack_acct_pernet_init(struct net *net);



void nf_conntrack_acct_fini(void);



#endif /* _NF_CONNTRACK_ACCT_H */

include/net/netfilter/nf_conntrack_labels.h

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ int nf_connlabels_replace(struct nf_conn *ct, 
			  const u32 *data, const u32 *mask, unsigned int words);



#ifdef CONFIG_NF_CONNTRACK_LABELS

int nf_conntrack_labels_init(void);

int nf_connlabels_get(struct net *net, unsigned int bit);

void nf_connlabels_put(struct net *net);

#else