diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:52:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 15:52:11 -0700 |
| commit | 27e2df2228712af43e657b9768828448c64ba424 (patch) | |
| tree | 1c86905fd366e8af66ea75bfd34a50f7084e0869 /net/ipv6/reassembly.c | |
| parent | c0d6f9663b30a09ed725229b2d50391268c8538e (diff) | |
| parent | e104411b82f5c4d19752c335492036abdbf5880d (diff) | |
| download | op-kernel-dev-27e2df2228712af43e657b9768828448c64ba424.zip op-kernel-dev-27e2df2228712af43e657b9768828448c64ba424.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv6/reassembly.c')
| -rw-r--r-- | net/ipv6/reassembly.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 9d9e043..e4fe9ee 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -479,12 +479,9 @@ static void ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb, /* Point into the IP datagram 'data' part. */ if (!pskb_pull(skb, (u8 *) (fhdr + 1) - skb->data)) goto err; - if (end-offset < skb->len) { - if (pskb_trim(skb, end - offset)) - goto err; - if (skb->ip_summed != CHECKSUM_UNNECESSARY) - skb->ip_summed = CHECKSUM_NONE; - } + + if (pskb_trim_rcsum(skb, end - offset)) + goto err; /* Find out which fragments are in front and at the back of us * in the chain of fragments so far. We must know where to put |
