patch-2.4.0-test2 linux/net/ipv4/icmp.c

• Lines: 18
• Date: Thu Jun 22 07:23:26 2000
• Orig file: v2.4.0-test1/linux/net/ipv4/icmp.c
• Orig date: Wed Apr 26 16:34:09 2000

diff -u --recursive --new-file v2.4.0-test1/linux/net/ipv4/icmp.c linux/net/ipv4/icmp.c
@@ -3,7 +3,7 @@
  *	
  *		Alan Cox, <alan@redhat.com>
  *
- *	Version: $Id: icmp.c,v 1.69 2000/04/15 01:48:10 davem Exp $
+ *	Version: $Id: icmp.c,v 1.70 2000/06/21 17:16:21 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -669,7 +669,7 @@
 	room -= sizeof(struct iphdr) + icmp_param.replyopts.optlen;
 	room -= sizeof(struct icmphdr);
 
-	icmp_param.data_len=(iph->ihl<<2)+skb_in->len;
+	icmp_param.data_len=(iph->ihl<<2)+(skb_in->tail-(u8*)iph);
 	if (icmp_param.data_len > room)
 		icmp_param.data_len = room;