Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / netfilter / nf_conntrack_timestamp.c

diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
index 7ea8026f07c9c843698bb54c68eb236840956bf9..902fb0a6b38ad9baac15c3fc3f17a3e695510db8 100644 (file)
--- a/net/netfilter/nf_conntrack_timestamp.c
+++ b/net/netfilter/nf_conntrack_timestamp.c
@@ -88,37 +88,28 @@ static void nf_conntrack_tstamp_fini_sysctl(struct net *net)
 }
 #endif
 
-int nf_conntrack_tstamp_init(struct net *net)
+int nf_conntrack_tstamp_pernet_init(struct net *net)
 {
-       int ret;
-
        net->ct.sysctl_tstamp = nf_ct_tstamp;
+       return nf_conntrack_tstamp_init_sysctl(net);
+}
 
-       if (net_eq(net, &init_net)) {
-               ret = nf_ct_extend_register(&tstamp_extend);
-               if (ret < 0) {
-                       printk(KERN_ERR "nf_ct_tstamp: Unable to register "
-                                       "extension\n");
-                       goto out_extend_register;
-               }
-       }
+void nf_conntrack_tstamp_pernet_fini(struct net *net)
+{
+       nf_conntrack_tstamp_fini_sysctl(net);
+       nf_ct_extend_unregister(&tstamp_extend);
+}
 
-       ret = nf_conntrack_tstamp_init_sysctl(net);
+int nf_conntrack_tstamp_init(void)
+{
+       int ret;
+       ret = nf_ct_extend_register(&tstamp_extend);
        if (ret < 0)
-               goto out_sysctl;
-
-       return 0;
-
-out_sysctl:
-       if (net_eq(net, &init_net))
-               nf_ct_extend_unregister(&tstamp_extend);
-out_extend_register:
+               pr_err("nf_ct_tstamp: Unable to register extension\n");
        return ret;
 }
 
-void nf_conntrack_tstamp_fini(struct net *net)
+void nf_conntrack_tstamp_fini(void)
 {
-       nf_conntrack_tstamp_fini_sysctl(net);
-       if (net_eq(net, &init_net))
-               nf_ct_extend_unregister(&tstamp_extend);
+       nf_ct_extend_unregister(&tstamp_extend);
 }