patch-2.1.97 linux/net/ipv4/ip_fragment.c

• Lines: 40
• Date: Fri Apr 17 20:30:13 1998
• Orig file: v2.1.96/linux/net/ipv4/ip_fragment.c
• Orig date: Thu Mar 26 15:57:13 1998

diff -u --recursive --new-file v2.1.96/linux/net/ipv4/ip_fragment.c linux/net/ipv4/ip_fragment.c
@@ -5,7 +5,7 @@
  *
  *		The IP fragmentation functionality.
  *		
- * Version:	$Id: ip_fragment.c,v 1.33 1998/03/19 08:34:08 davem Exp $
+ * Version:	$Id: ip_fragment.c,v 1.36 1998/04/18 02:13:07 davem Exp $
  *
  * Authors:	Fred N. van Kempen <waltje@uWalt.NL.Mugnet.ORG>
  *		Alan Cox <Alan.Cox@linux.org>
@@ -346,10 +346,9 @@
 	memcpy(ptr, qp->iph, qp->ihlen);
 	ptr += qp->ihlen;
 
-	count = 0;
-
 	/* Copy the data portions of all fragments into the new buffer. */
 	fp = qp->fragments;
+	count = qp->ihlen;
 	while(fp) {
 		if (fp->len < 0 || count+fp->len > skb->len) {
 			NETDEBUG(printk(KERN_ERR "Invalid fragment list: "
@@ -360,7 +359,7 @@
 			return NULL;
 		}
 		memcpy((ptr + fp->offset), fp->ptr, fp->len);
-		if (!count) {
+		if (count == qp->ihlen) {
 			skb->dst = dst_clone(fp->skb->dst);
 			skb->dev = fp->skb->dev;
 		}
@@ -376,7 +375,7 @@
 	/* Done with all fragments. Fixup the new IP header. */
 	iph = skb->nh.iph;
 	iph->frag_off = 0;
-	iph->tot_len = htons((iph->ihl * 4) + count);
+	iph->tot_len = htons(count);
 
 	ip_statistics.IpReasmOKs++;
 	return skb;