diff --git a/[refs] b/[refs] index f7b1190c7f2d..8b9bc9a529ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe2a7ce4de07472ace0cdf460a41f462a4621687 +refs/heads/master: fecea3a389c89de9afae2eda74fad894d5677229 diff --git a/trunk/net/netfilter/core.c b/trunk/net/netfilter/core.c index a90ac83c5918..5bb34737501f 100644 --- a/trunk/net/netfilter/core.c +++ b/trunk/net/netfilter/core.c @@ -174,7 +174,6 @@ int nf_hook_slow(u_int8_t pf, unsigned int hook, struct sk_buff *skb, 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 @@ int nf_hook_slow(u_int8_t pf, unsigned int hook, struct sk_buff *skb, verdict >> NF_VERDICT_BITS)) goto next_hook; } -unlock: rcu_read_unlock(); return ret; }