Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5b4d383a1a562de6955cacd72e20809064ee137f

Authored by Wang Chen
Committed by David S. Miller
1 parent fa95c28322
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 0 additions and 1 deletions Side-by-side Diff

... ... @@ -540,7 +540,6 @@
540 540 icmp_param.data.icmph.checksum = 0;
541 541 icmp_param.skb = skb_in;
542 542 icmp_param.offset = skb_network_offset(skb_in);
543   - icmp_out_count(icmp_param.data.icmph.type);
544 543 inet_sk(icmp_socket->sk)->tos = tos;
545 544 ipc.addr = iph->saddr;
546 545 ipc.opt = &icmp_param.replyopts;