Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[firefly-linux-kernel-4.4.55.git] / net / netfilter / nf_conntrack_ecache.c

diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
index 5bd3047ddeec5cf38b160931777fb6c63e6c59b4..e7be79e640de0397ac9f5e5aaab00faf1f2c8730 100644 (file)
--- a/net/netfilter/nf_conntrack_ecache.c
+++ b/net/netfilter/nf_conntrack_ecache.c
@@ -84,7 +84,7 @@ EXPORT_SYMBOL_GPL(nf_ct_deliver_cached_events);
 int nf_conntrack_register_notifier(struct net *net,
                                   struct nf_ct_event_notifier *new)
 {
-       int ret = 0;
+       int ret;
        struct nf_ct_event_notifier *notify;
 
        mutex_lock(&nf_ct_ecache_mutex);
@@ -95,8 +95,7 @@ int nf_conntrack_register_notifier(struct net *net,
                goto out_unlock;
        }
        rcu_assign_pointer(net->ct.nf_conntrack_event_cb, new);
-       mutex_unlock(&nf_ct_ecache_mutex);
-       return ret;
+       ret = 0;
 
 out_unlock:
        mutex_unlock(&nf_ct_ecache_mutex);
@@ -121,7 +120,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_unregister_notifier);
 int nf_ct_expect_register_notifier(struct net *net,
                                   struct nf_exp_event_notifier *new)
 {
-       int ret = 0;
+       int ret;
        struct nf_exp_event_notifier *notify;
 
        mutex_lock(&nf_ct_ecache_mutex);
@@ -132,8 +131,7 @@ int nf_ct_expect_register_notifier(struct net *net,
                goto out_unlock;
        }
        rcu_assign_pointer(net->ct.nf_expect_event_cb, new);
-       mutex_unlock(&nf_ct_ecache_mutex);
-       return ret;
+       ret = 0;
 
 out_unlock:
        mutex_unlock(&nf_ct_ecache_mutex);
@@ -199,8 +197,7 @@ static int nf_conntrack_event_init_sysctl(struct net *net)
        table[1].data = &net->ct.sysctl_events_retry_timeout;
 
        net->ct.event_sysctl_header =
-               register_net_sysctl_table(net,
-                                         nf_net_netfilter_sysctl_path, table);
+               register_net_sysctl(net, "net/netfilter", table);
        if (!net->ct.event_sysctl_header) {
                printk(KERN_ERR "nf_ct_event: can't register to sysctl.\n");
                goto out_register;