diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:20:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:20:11 -0400 |
| commit | f7402dc44d617be807e7184c6c624611b2d35b4e (patch) | |
| tree | 1df6e5877ee3083838c7956285a5966d78d0646f /net/ipv4/ip_fragment.c | |
| parent | e72225d160a2529d6ce6d5898a267f7dae02aa6e (diff) | |
| parent | 832079d29a781ddf89467662ab4b540f0c1e668a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/ip_fragment.c')
| -rw-r--r-- | net/ipv4/ip_fragment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 9e6e683cc34d..e7d26d9943c2 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
| @@ -457,7 +457,7 @@ static void ip_frag_queue(struct ipq *qp, struct sk_buff *skb) | |||
| 457 | 457 | ||
| 458 | if (pskb_pull(skb, ihl) == NULL) | 458 | if (pskb_pull(skb, ihl) == NULL) |
| 459 | goto err; | 459 | goto err; |
| 460 | if (pskb_trim(skb, end-offset)) | 460 | if (pskb_trim_rcsum(skb, end-offset)) |
| 461 | goto err; | 461 | goto err; |
| 462 | 462 | ||
| 463 | /* Find out which fragments are in front and at the back of us | 463 | /* Find out which fragments are in front and at the back of us |