diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /net/packet | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index e2d1def70841..031a5e6fb4aa 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
| @@ -500,7 +500,7 @@ static inline unsigned int run_filter(struct sk_buff *skb, struct sock *sk, | |||
| 500 | struct sk_filter *filter; | 500 | struct sk_filter *filter; |
| 501 | 501 | ||
| 502 | rcu_read_lock_bh(); | 502 | rcu_read_lock_bh(); |
| 503 | filter = rcu_dereference(sk->sk_filter); | 503 | filter = rcu_dereference_bh(sk->sk_filter); |
| 504 | if (filter != NULL) | 504 | if (filter != NULL) |
| 505 | res = sk_run_filter(skb, filter->insns, filter->len); | 505 | res = sk_run_filter(skb, filter->insns, filter->len); |
| 506 | rcu_read_unlock_bh(); | 506 | rcu_read_unlock_bh(); |