From: Wang Chen <wangchen@cn.fujitsu.com>
To: "David S. Miller" <davem@davemloft.net>,
David L Stevens <dlstevens@us.ibm.com>
Cc: netdev@vger.kernel.org
Subject: [PATCH] ICMP: ICMP_MIB_OUTMSGS increment duplicated
Date: Wed, 16 Jan 2008 17:59:23 +0800 [thread overview]
Message-ID: <478DD57B.6020503@cn.fujitsu.com> (raw)
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 <wangchen@cn.fujitsu.com>
---
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;
--
WCN
next reply other threads:[~2008-01-16 10:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-16 9:59 Wang Chen [this message]
2008-01-16 11:49 ` [PATCH] ICMP: ICMP_MIB_OUTMSGS increment duplicated Herbert Xu
2008-01-16 16:23 ` David Stevens
2008-01-16 23:17 ` Herbert Xu
2008-01-17 0:10 ` David Stevens
2008-01-17 0:55 ` Wang Chen
2008-01-21 9:46 ` [PATCH 1/2] IPV6: ICMP6_MIB_OUTMSGS " Wang Chen
2008-01-21 9:59 ` YOSHIFUJI Hideaki / 吉藤英明
2008-01-21 10:57 ` David Miller
2008-01-21 10:59 ` Wang Chen
2008-01-21 11:06 ` David Miller
2008-01-21 11:12 ` Wang Chen
2008-01-21 9:46 ` [PATCH 2/2] IPV6: RFC 2011 compatibility broken Wang Chen
2008-01-21 9:58 ` YOSHIFUJI Hideaki / 吉藤英明
2008-01-21 19:17 ` David Stevens
2008-01-21 11:15 ` [PATCH] ICMP: ICMP_MIB_OUTMSGS increment duplicated Wang Chen
2008-01-21 11:25 ` David Miller
2008-01-21 11:34 ` Wang Chen
2008-01-21 11:40 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=478DD57B.6020503@cn.fujitsu.com \
--to=wangchen@cn.fujitsu.com \
--cc=davem@davemloft.net \
--cc=dlstevens@us.ibm.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).