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 /net/netfilter/nf_conntrack_timestamp.c | |
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 'net/netfilter/nf_conntrack_timestamp.c')
-rw-r--r-- | net/netfilter/nf_conntrack_timestamp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c index bae151d93bea..705b912bd91f 100644 --- a/net/netfilter/nf_conntrack_timestamp.c +++ b/net/netfilter/nf_conntrack_timestamp.c @@ -28,14 +28,9 @@ static const struct nf_ct_ext_type tstamp_extend = { .id = NF_CT_EXT_TSTAMP, }; -int nf_conntrack_tstamp_pernet_init(struct net *net) +void nf_conntrack_tstamp_pernet_init(struct net *net) { net->ct.sysctl_tstamp = nf_ct_tstamp; - return 0; -} - -void nf_conntrack_tstamp_pernet_fini(struct net *net) -{ } int nf_conntrack_tstamp_init(void) |