diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-28 04:19:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-28 04:19:40 -0400 |
| commit | 1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9 (patch) | |
| tree | fe3dc41cbb47ae12b7c3faf6a88b097349e50d5a /net/ipv6/reassembly.c | |
| parent | e35c3269edba151e1c703d87068a28ce2cd65bb0 (diff) | |
| parent | d420895efb259a78dda50f95289571faa6e10e41 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl4965-base.c
Diffstat (limited to 'net/ipv6/reassembly.c')
| -rw-r--r-- | net/ipv6/reassembly.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 13509f906d89..6ab957ec2dd6 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
| @@ -245,6 +245,8 @@ fq_find(struct net *net, __be32 id, struct in6_addr *src, struct in6_addr *dst, | |||
| 245 | arg.id = id; | 245 | arg.id = id; |
| 246 | arg.src = src; | 246 | arg.src = src; |
| 247 | arg.dst = dst; | 247 | arg.dst = dst; |
| 248 | |||
| 249 | read_lock(&ip6_frags.lock); | ||
| 248 | hash = ip6qhashfn(id, src, dst); | 250 | hash = ip6qhashfn(id, src, dst); |
| 249 | 251 | ||
| 250 | q = inet_frag_find(&net->ipv6.frags, &ip6_frags, &arg, hash); | 252 | q = inet_frag_find(&net->ipv6.frags, &ip6_frags, &arg, hash); |