Commit 5b4d383a authored Jan 21, 2008 by Wang Chen Committed by David S. Miller Jan 21, 2008

[ICMP]: ICMP_MIB_OUTMSGS increment duplicated



Commit "96793b48" (Add ICMPMsgStats
MIB (RFC 4293)) 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 <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent fa95c283

net/ipv4/icmp.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -540,7 +540,6 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
		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;

Admin message