diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-28 10:19:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-28 10:19:40 +0200 |
| commit | 1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9 (patch) | |
| tree | fe3dc41cbb47ae12b7c3faf6a88b097349e50d5a /net/ipv4/ip_fragment.c | |
| parent | bnx2x: Update version (diff) | |
| parent | ipv6 route: Convert rt6_device_match() to use RT6_LOOKUP_F_xxx flags. (diff) | |
| download | linux-1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9.tar.xz linux-1b63ba8a86c85524a8d7e5953b314ce71ebcb9c9.zip | |
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/ipv4/ip_fragment.c')
| -rw-r--r-- | net/ipv4/ip_fragment.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 91e321407313..fbd5804b5d83 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -227,6 +227,8 @@ static inline struct ipq *ip_find(struct net *net, struct iphdr *iph, u32 user) arg.iph = iph; arg.user = user; + + read_lock(&ip4_frags.lock); hash = ipqhashfn(iph->id, iph->saddr, iph->daddr, iph->protocol); q = inet_frag_find(&net->ipv4.frags, &ip4_frags, &arg, hash); |