Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / net / bridge / br_netfilter_hooks.c

diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c
index 1f1e62095464f99eaca8de49a772289f057bd943..067cf03134492a33f10982755105e103666cd1ef 100644 (file)
--- a/net/bridge/br_netfilter_hooks.c
+++ b/net/bridge/br_netfilter_hooks.c
@@ -997,13 +997,10 @@ int br_nf_hook_thresh(unsigned int hook, struct net *net,
        if (!elem)
                return okfn(net, sk, skb);
 
-       /* We may already have this, but read-locks nest anyway */
-       rcu_read_lock();
        nf_hook_state_init(&state, hook, NFPROTO_BRIDGE, indev, outdev,
                           sk, net, okfn);
 
        ret = nf_hook_slow(skb, &state, elem);
-       rcu_read_unlock();
        if (ret == 1)
                ret = okfn(net, sk, skb);