mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: drivers/firmware/iscsi_ibft.c
This commit is contained in:
commit
47871889c6
2090 changed files with 103844 additions and 44833 deletions
|
|
@ -500,7 +500,7 @@ static inline unsigned int run_filter(struct sk_buff *skb, struct sock *sk,
|
|||
struct sk_filter *filter;
|
||||
|
||||
rcu_read_lock_bh();
|
||||
filter = rcu_dereference(sk->sk_filter);
|
||||
filter = rcu_dereference_bh(sk->sk_filter);
|
||||
if (filter != NULL)
|
||||
res = sk_run_filter(skb, filter->insns, filter->len);
|
||||
rcu_read_unlock_bh();
|
||||
|
|
|
|||
Loading…
Reference in a new issue