diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-01-18 07:46:52 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-18 21:33:05 -0800 |
| commit | 80f8f1027b99660897bdeaeae73002185d829906 (patch) | |
| tree | b8aafe71974b2b7295f20eeb1fad6191fadd8551 /net/core | |
| parent | d6ae3bae3d1bf7a8bf367e29f2cac0788dcd0db5 (diff) | |
net: filter: dont block softirqs in sk_run_filter()
Packet filter (BPF) doesnt need to disable softirqs, being fully
re-entrant and lock-less.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/filter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index afc58374ca9..232b1873bb2 100644 --- 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; } |