* [PATCH net-next] netfilter: conntrack: Remove unused function declarations
@ 2023-08-04 13:41 Yue Haibing
2023-08-05 19:24 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Yue Haibing @ 2023-08-04 13:41 UTC (permalink / raw)
To: pablo, kadlec, fw, davem, edumazet, kuba, pabeni, yuehaibing
Cc: netfilter-devel, coreteam, netdev
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>
---
include/net/netfilter/nf_conntrack.h | 4 ----
include/net/netfilter/nf_conntrack_acct.h | 2 --
include/net/netfilter/nf_conntrack_labels.h | 1 -
3 files changed, 7 deletions(-)
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index a72028dbef0c..4085765c3370 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -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);
diff --git a/include/net/netfilter/nf_conntrack_acct.h b/include/net/netfilter/nf_conntrack_acct.h
index 4b2b7f8914ea..a120685cac93 100644
--- a/include/net/netfilter/nf_conntrack_acct.h
+++ b/include/net/netfilter/nf_conntrack_acct.h
@@ -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 */
diff --git a/include/net/netfilter/nf_conntrack_labels.h b/include/net/netfilter/nf_conntrack_labels.h
index 66bab6c60d12..fcb19a4e8f2b 100644
--- a/include/net/netfilter/nf_conntrack_labels.h
+++ b/include/net/netfilter/nf_conntrack_labels.h
@@ -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
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] netfilter: conntrack: Remove unused function declarations
2023-08-04 13:41 [PATCH net-next] netfilter: conntrack: Remove unused function declarations Yue Haibing
@ 2023-08-05 19:24 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2023-08-05 19:24 UTC (permalink / raw)
To: Yue Haibing
Cc: pablo, kadlec, fw, davem, edumazet, kuba, pabeni, netfilter-devel,
coreteam, netdev
On Fri, Aug 04, 2023 at 09:41:49PM +0800, Yue Haibing wrote:
> 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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-05 19:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-04 13:41 [PATCH net-next] netfilter: conntrack: Remove unused function declarations Yue Haibing
2023-08-05 19:24 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).