aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/netfilter/nf_conntrack_timestamp.h
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2018-12-18 23:04:49 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2018-12-21 00:51:54 +0100
commitfc3893fd5cfc3c654ae4b9c8d7ee39ea70e4bdc6 (patch)
tree224ecdd63114382adb372bcb72f4b8403d10a2f0 /include/net/netfilter/nf_conntrack_timestamp.h
parentnetfilter: conntrack: merge ecache and timestamp sysctl tables with main one (diff)
downloadlinux-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_timestamp.h')
-rw-r--r--include/net/netfilter/nf_conntrack_timestamp.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/include/net/netfilter/nf_conntrack_timestamp.h b/include/net/netfilter/nf_conntrack_timestamp.h
index 3b661986be8f..0ed617bf0a3d 100644
--- a/include/net/netfilter/nf_conntrack_timestamp.h
+++ b/include/net/netfilter/nf_conntrack_timestamp.h
@@ -49,21 +49,12 @@ static inline void nf_ct_set_tstamp(struct net *net, bool enable)
}
#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
-int nf_conntrack_tstamp_pernet_init(struct net *net);
-void nf_conntrack_tstamp_pernet_fini(struct net *net);
+void nf_conntrack_tstamp_pernet_init(struct net *net);
int nf_conntrack_tstamp_init(void);
void nf_conntrack_tstamp_fini(void);
#else
-static inline int nf_conntrack_tstamp_pernet_init(struct net *net)
-{
- return 0;
-}
-
-static inline void nf_conntrack_tstamp_pernet_fini(struct net *net)
-{
- return;
-}
+static inline void nf_conntrack_tstamp_pernet_init(struct net *net) {}
static inline int nf_conntrack_tstamp_init(void)
{