Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

[mv-sheeva.git] / net / netfilter / core.c

diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index a90ac83c591852a6bf7be42fb32b9f572ddcbb6e..60ec4e4badaa3b48bb680b215f8795925225e5f3 100644 (file)
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -174,7 +174,6 @@ next_hook:
                             outdev, &elem, okfn, hook_thresh);
        if (verdict == NF_ACCEPT || verdict == NF_STOP) {
                ret = 1;
-               goto unlock;
        } else if (verdict == NF_DROP) {
                kfree_skb(skb);
                ret = -EPERM;
@@ -183,7 +182,6 @@ next_hook:
                              verdict >> NF_VERDICT_BITS))
                        goto next_hook;
        }
-unlock:
        rcu_read_unlock();
        return ret;
 }
@@ -275,8 +273,8 @@ void __init netfilter_init(void)
 
 #ifdef CONFIG_SYSCTL
 struct ctl_path nf_net_netfilter_sysctl_path[] = {
-       { .procname = "net", .ctl_name = CTL_NET, },
-       { .procname = "netfilter", .ctl_name = NET_NETFILTER, },
+       { .procname = "net", },
+       { .procname = "netfilter", },
        { }
 };
 EXPORT_SYMBOL_GPL(nf_net_netfilter_sysctl_path);