diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-23 09:56:33 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-23 09:56:33 -0400 |
| commit | 85ae01b2da0ed606a2e8d840aadef90fd30220a1 (patch) | |
| tree | f9eaa974b88b9db09dab9e5f6876e87d12543fe4 /net/ipv4/fib_trie.c | |
| parent | 6407d474e6ae6a798fa5ba40b32f508a52de80ff (diff) | |
| parent | 306ff3e473a970f88680e8355c0900fcab0357e2 (diff) | |
Merge remote branch 'alsa/devel' into topic/usb
Diffstat (limited to 'net/ipv4/fib_trie.c')
| -rw-r--r-- | net/ipv4/fib_trie.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index af5d89792860..01ef8ba9025c 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c | |||
| @@ -961,7 +961,9 @@ fib_find_node(struct trie *t, u32 key) | |||
| 961 | struct node *n; | 961 | struct node *n; |
| 962 | 962 | ||
| 963 | pos = 0; | 963 | pos = 0; |
| 964 | n = rcu_dereference(t->trie); | 964 | n = rcu_dereference_check(t->trie, |
| 965 | rcu_read_lock_held() || | ||
| 966 | lockdep_rtnl_is_held()); | ||
| 965 | 967 | ||
| 966 | while (n != NULL && NODE_TYPE(n) == T_TNODE) { | 968 | while (n != NULL && NODE_TYPE(n) == T_TNODE) { |
| 967 | tn = (struct tnode *) n; | 969 | tn = (struct tnode *) n; |