Dave, how about this one. It's like that one of IPV6. Wang Chen said the following on 2008-1-16 17:59: > In tree net-2.6.25, commit "96793b482540f3a26e2188eaf75cb56b7829d3e3" > made a mistake. > > In that patch, David L added a icmp_out_count() in ip_push_pending_frames(), > remove icmp_out_count() from icmp_reply(). But he forgot to remove > icmp_out_count() from icmp_send() too. > Since icmp_send and icmp_reply will call icmp_push_reply, which will call > ip_push_pending_frames, a duplicated increment happened in icmp_send. > > This patch remove the icmp_out_count from icmp_send too. > > Signed-off-by: Wang Chen <[EMAIL PROTECTED]> > --- > diff -Nurp linux-2.6.24.rc8.org/net/ipv4/icmp.c > linux-2.6.24.rc8/net/ipv4/icmp.c > --- linux-2.6.24.rc8.org/net/ipv4/icmp.c 2008-01-16 17:45:02.000000000 > +0800 > +++ linux-2.6.24.rc8/net/ipv4/icmp.c 2008-01-16 17:52:13.000000000 +0800 > @@ -540,7 +540,6 @@ void icmp_send(struct sk_buff *skb_in, i > icmp_param.data.icmph.checksum = 0; > icmp_param.skb = skb_in; > icmp_param.offset = skb_network_offset(skb_in); > - icmp_out_count(icmp_param.data.icmph.type); > inet_sk(icmp_socket->sk)->tos = tos; > ipc.addr = iph->saddr; > ipc.opt = &icmp_param.replyopts; >
-- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
