patch-1.3.95 linux/net/ipv4/ip_output.c

• Lines: 24
• Date: Wed Apr 24 13:00:04 1996
• Orig file: v1.3.94/linux/net/ipv4/ip_output.c
• Orig date: Sun Apr 21 19:22:17 1996

diff -u --recursive --new-file v1.3.94/linux/net/ipv4/ip_output.c linux/net/ipv4/ip_output.c
@@ -642,9 +642,10 @@
 	 *	choice RAW frames within 20 bytes of maximum size(rare) to the long path
 	 */
 
-	length += sizeof(struct iphdr);
-	if (!sk->ip_hdrincl && opt) 
-		length += opt->optlen;
+	if (!sk->ip_hdrincl) {
+		length += sizeof(struct iphdr);
+		if(opt) length += opt->optlen;
+	}
 
 	if(length <= dev->mtu && !MULTICAST(daddr) && daddr!=0xFFFFFFFF && daddr!=dev->pa_brdaddr)
 	{	
@@ -708,7 +709,7 @@
 			getfrag(frag,saddr,((char *)iph)+iph->ihl*4,0, length-iph->ihl*4);
 		}
 		else
-			getfrag(frag,saddr,(void *)iph,0,length-20);
+			getfrag(frag,saddr,(void *)iph,0,length);
 		dev_unlock_list();
 #ifdef CONFIG_FIREWALL
 		if(call_out_firewall(PF_INET, skb->dev, iph)< FW_ACCEPT)