Merge branch 'sysdev' into release

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

diff --git a/net/core/filter.c b/net/core/filter.c
index afc58374ca961a3b5496727d8836824a3bd83b7d..232b1873bb28988069ef1b1642ad8cd7ef689b8f 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -142,14 +142,14 @@ int sk_filter(struct sock *sk, struct sk_buff *skb)
        if (err)
                return err;
 
-       rcu_read_lock_bh();
-       filter = rcu_dereference_bh(sk->sk_filter);
+       rcu_read_lock();
+       filter = rcu_dereference(sk->sk_filter);
        if (filter) {
                unsigned int pkt_len = sk_run_filter(skb, filter->insns);
 
                err = pkt_len ? pskb_trim(skb, pkt_len) : -EPERM;
        }
-       rcu_read_unlock_bh();
+       rcu_read_unlock();
 
        return err;
 }