[PATCH] Bogus extra bytes in ICMP errors in 2.3.0-test3-7

[Rusty Russell <rusty@xxxxxxxxxxxxxxxx>]

Finally tracked down why we send 20 extra `crap' bytes in ICMP
responses: someone changed 2.2's `skb_in->len' to
`(skb_in->tail-(u8*)iph)'.

Rusty.
--- working-2.4.0-test3-7/net/ipv4/icmp.c.~1~   Thu Jun 29 01:26:09 2000
+++ working-2.4.0-test3-7/net/ipv4/icmp.c       Wed Jul 12 16:46:37 2000
@@ -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->tail-(u8*)iph);
+       icmp_param.data_len = skb_in->tail - (u8*)iph;
        if (icmp_param.data_len > room)
                icmp_param.data_len = room;
        

--
Hacking time.