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

• Lines: 50
• Date: Sat Jul 20 08:58:28 1996
• Orig file: v2.0.7/linux/net/ipv4/ip_fragment.c
• Orig date: Mon May 13 23:02:53 1996

diff -u --recursive --new-file v2.0.7/linux/net/ipv4/ip_fragment.c linux/net/ipv4/ip_fragment.c
@@ -610,6 +610,8 @@
 	struct sk_buff *skb2;
 	int left, mtu, hlen, len;
 	int offset;
+	
+	unsigned short true_hard_header_len;
 
 	/*
 	 *	Point into the IP datagram header.
@@ -624,12 +626,18 @@
 #endif
 
 	/*
+	 * Calculate the length of the link-layer header appended to
+	 * the IP-packet.
+	 */
+	true_hard_header_len = ((unsigned char *)iph) - raw;
+
+	/*
 	 *	Setup starting values.
 	 */
 
 	hlen = iph->ihl * 4;
 	left = ntohs(iph->tot_len) - hlen;	/* Space per frame */
-	hlen += dev->hard_header_len;		/* Total header size */
+	hlen += true_hard_header_len;
 	mtu = (dev->mtu - hlen);		/* Size of data space */
 	ptr = (raw + hlen);			/* Where to start from */
 
@@ -706,8 +714,11 @@
 		 */
 
 		skb2->arp = skb->arp;
+		skb2->protocol = htons(ETH_P_IP); /* Atleast PPP needs this */
+#if 0		
 		if(skb->free==0)
 			printk(KERN_ERR "IP fragmenter: BUG free!=1 in fragmenter\n");
+#endif			
 		skb2->free = 1;
 		skb_put(skb2,len + hlen);
 		skb2->h.raw=(char *) skb2->data;
@@ -735,7 +746,7 @@
 		memcpy(skb2->h.raw + hlen, ptr, len);
 		left -= len;
 
-		skb2->h.raw+=dev->hard_header_len;
+		skb2->h.raw+=true_hard_header_len;
 
 		/*
 		 *	Fill in the new header fields.