Commit:     5b4d383a1a562de6955cacd72e20809064ee137f
Parent:     fa95c28322a312a798a688c655458ab2079b72eb
Author:     Wang Chen <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 21 03:39:45 2008 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 21 03:39:45 2008 -0800

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/ipv4/icmp.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 233de06..82baea0 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)   = 0;
        icmp_param.skb    = skb_in;
        icmp_param.offset = skb_network_offset(skb_in);
-       icmp_out_count(;
        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 git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to