diff options
| author | Florian Westphal | 2018-12-18 23:04:49 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2018-12-21 00:51:54 +0100 |
| commit | fc3893fd5cfc3c654ae4b9c8d7ee39ea70e4bdc6 (patch) | |
| tree | 224ecdd63114382adb372bcb72f4b8403d10a2f0 /include/net/netfilter/nf_conntrack_acct.h | |
| parent | netfilter: conntrack: merge ecache and timestamp sysctl tables with main one (diff) | |
| download | kernel-qcow2-linux-fc3893fd5cfc3c654ae4b9c8d7ee39ea70e4bdc6.tar.gz kernel-qcow2-linux-fc3893fd5cfc3c654ae4b9c8d7ee39ea70e4bdc6.tar.xz kernel-qcow2-linux-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_acct.h')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_acct.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/netfilter/nf_conntrack_acct.h b/include/net/netfilter/nf_conntrack_acct.h index ae5a1c37387e..bc6745d3010e 100644 --- a/include/net/netfilter/nf_conntrack_acct.h +++ b/include/net/netfilter/nf_conntrack_acct.h @@ -58,8 +58,7 @@ static inline void nf_ct_set_acct(struct net *net, bool enable) net->ct.sysctl_acct = enable; } -int nf_conntrack_acct_pernet_init(struct net *net); -void nf_conntrack_acct_pernet_fini(struct net *net); +void nf_conntrack_acct_pernet_init(struct net *net); int nf_conntrack_acct_init(void); void nf_conntrack_acct_fini(void); |