diff options
| author |   Florian Westphal <fw@strlen.de> | 2018-12-18 23:04:49 +0100 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2018-12-21 00:51:54 +0100 |
| commit | fc3893fd5cfc3c654ae4b9c8d7ee39ea70e4bdc6 (patch) | |
| tree | 224ecdd63114382adb372bcb72f4b8403d10a2f0 /include/net/netfilter/nf_conntrack_helper.h | |
| parent | netfilter: conntrack: merge ecache and timestamp sysctl tables with main one (diff) | |
| download | linux-dev-fc3893fd5cfc3c654ae4b9c8d7ee39ea70e4bdc6.tar.xz linux-dev-fc3893fd5cfc3c654ae4b9c8d7ee39ea70e4bdc6.zip | |
netfilter: conntrack: remove empty pernet fini stubs
after moving sysctl handling into single place, the init functions
can't fail anymore and some of the fini functions are empty.
Remove them and change return type to void.
This also simplifies error unwinding in conntrack module init path.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net/netfilter/nf_conntrack_helper.h')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_helper.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h index 2492120b8097..ec52a8dc32fd 100644 --- a/include/net/netfilter/nf_conntrack_helper.h +++ b/include/net/netfilter/nf_conntrack_helper.h @@ -124,8 +124,7 @@ static inline void *nfct_help_data(const struct nf_conn *ct) return (void *)help->data; } -int nf_conntrack_helper_pernet_init(struct net *net); -void nf_conntrack_helper_pernet_fini(struct net *net); +void nf_conntrack_helper_pernet_init(struct net *net); int nf_conntrack_helper_init(void); void nf_conntrack_helper_fini(void); |