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

• Lines: 27
• Date: Tue Aug 12 11:30:25 1997
• Orig file: v2.0.30/linux/net/ipv4/ip_fragment.c
• Orig date: Fri Nov 22 01:58:34 1996

diff -u --recursive --new-file v2.0.30/linux/net/ipv4/ip_fragment.c linux/net/ipv4/ip_fragment.c
@@ -388,6 +388,8 @@
 		fp = fp->next;
 	}
 
+	skb->pkt_type = qp->fragments->skb->pkt_type;
+	skb->protocol = qp->fragments->skb->protocol;
 	/* We glued together all fragments, so remove the queue entry. */
 	ip_free(qp);
 
@@ -521,7 +523,7 @@
 	prev = NULL;
 	for(next = qp->fragments; next != NULL; next = next->next)
 	{
-		if (next->offset > offset)
+		if (next->offset >= offset)
 			break;	/* bingo! */
 		prev = next;
 	}
@@ -567,7 +569,7 @@
 			else
 				qp->fragments = tmp->next;
 
-			if (tfp->next != NULL)
+			if (tmp->next != NULL)
 				tmp->next->prev = tmp->prev;
 			
 			next=tfp;	/* We have killed the original next frame */