summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorWang Chen <wangchen@cn.fujitsu.com>2008-01-21 03:39:45 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-21 03:39:45 -0800
commit5b4d383a1a562de6955cacd72e20809064ee137f (patch)
tree461579467e46a46611c8e3745bc9cb5fa7d41a99 /net
parentfa95c28322a312a798a688c655458ab2079b72eb (diff)
downloadlinux-3.10-5b4d383a1a562de6955cacd72e20809064ee137f.tar.gz
linux-3.10-5b4d383a1a562de6955cacd72e20809064ee137f.tar.bz2
linux-3.10-5b4d383a1a562de6955cacd72e20809064ee137f.zip
[ICMP]: ICMP_MIB_OUTMSGS increment duplicated
Commit "96793b482540f3a26e2188eaf75cb56b7829d3e3" (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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/icmp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 233de063429..82baea02648 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -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;