From 1264266cc24129a77af3954a7cb13fbe7fdc5d26 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 3 Apr 2010 15:09:04 -0700
Subject: [PATCH] --- yaml --- r: 193952 b: refs/heads/master c:
 1f8438a853667d48055ad38384c63e94b32c6578 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/snmp.h | 1 +
 trunk/net/ipv4/icmp.c      | 5 +++--
 trunk/net/ipv6/icmp.c      | 2 ++
 trunk/net/ipv6/proc.c      | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4260176ba861..34fd6585220f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f66ef2d0649b220874532dfb83b6b5b368f83591
+refs/heads/master: 1f8438a853667d48055ad38384c63e94b32c6578
diff --git a/trunk/include/linux/snmp.h b/trunk/include/linux/snmp.h
index d2a9aa3c6c88..52797714ade7 100644
--- a/trunk/include/linux/snmp.h
+++ b/trunk/include/linux/snmp.h
@@ -100,6 +100,7 @@ enum
 	ICMP6_MIB_INMSGS,			/* InMsgs */
 	ICMP6_MIB_INERRORS,			/* InErrors */
 	ICMP6_MIB_OUTMSGS,			/* OutMsgs */
+	ICMP6_MIB_OUTERRORS,			/* OutErrors */
 	__ICMP6_MIB_MAX
 };
 
diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c
index 4b4c2bcd15db..d2aa7438c523 100644
--- a/trunk/net/ipv4/icmp.c
+++ b/trunk/net/ipv4/icmp.c
@@ -330,9 +330,10 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,
 	if (ip_append_data(sk, icmp_glue_bits, icmp_param,
 			   icmp_param->data_len+icmp_param->head_len,
 			   icmp_param->head_len,
-			   ipc, rt, MSG_DONTWAIT) < 0)
+			   ipc, rt, MSG_DONTWAIT) < 0) {
+		ICMP_INC_STATS_BH(sock_net(sk), ICMP_MIB_OUTERRORS);
 		ip_flush_pending_frames(sk);
-	else if ((skb = skb_peek(&sk->sk_write_queue)) != NULL) {
+	} else if ((skb = skb_peek(&sk->sk_write_queue)) != NULL) {
 		struct icmphdr *icmph = icmp_hdr(skb);
 		__wsum csum = 0;
 		struct sk_buff *skb1;
diff --git a/trunk/net/ipv6/icmp.c b/trunk/net/ipv6/icmp.c
index eb9abe24bdf0..a00c18aa6c8d 100644
--- a/trunk/net/ipv6/icmp.c
+++ b/trunk/net/ipv6/icmp.c
@@ -482,6 +482,7 @@ void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)
 			      np->tclass, NULL, &fl, (struct rt6_info*)dst,
 			      MSG_DONTWAIT);
 	if (err) {
+		ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS);
 		ip6_flush_pending_frames(sk);
 		goto out_put;
 	}
@@ -562,6 +563,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
 				(struct rt6_info*)dst, MSG_DONTWAIT);
 
 	if (err) {
+		ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS);
 		ip6_flush_pending_frames(sk);
 		goto out_put;
 	}
diff --git a/trunk/net/ipv6/proc.c b/trunk/net/ipv6/proc.c
index 58344c0fbd13..458eabfbe130 100644
--- a/trunk/net/ipv6/proc.c
+++ b/trunk/net/ipv6/proc.c
@@ -97,6 +97,7 @@ static const struct snmp_mib snmp6_icmp6_list[] = {
 	SNMP_MIB_ITEM("Icmp6InMsgs", ICMP6_MIB_INMSGS),
 	SNMP_MIB_ITEM("Icmp6InErrors", ICMP6_MIB_INERRORS),
 	SNMP_MIB_ITEM("Icmp6OutMsgs", ICMP6_MIB_OUTMSGS),
+	SNMP_MIB_ITEM("Icmp6OutErrors", ICMP6_MIB_OUTERRORS),
 	SNMP_MIB_SENTINEL
 };