From: Neil Horman <nhorman@tuxdriver.com>
Date: Mon, 16 Nov 2015 18:09:10 +0000 (-0500)
Subject: snmp: Remove duplicate OUTMCAST stat increment
X-Git-Tag: v3.16.35~905
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=427aad5236497cc354d2737b3b93929e397c93a7;p=thirdparty%2Fkernel%2Fstable.git

snmp: Remove duplicate OUTMCAST stat increment

commit 41033f029e393a64e81966cbe34d66c6cf8a2e7e upstream.

the OUTMCAST stat is double incremented, getting bumped once in the mcast code
itself, and again in the common ip output path.  Remove the mcast bump, as its
not needed

Validated by the reporter, with good results

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Reported-by: Claus Jensen <claus.jensen@microsemi.com>
CC: Claus Jensen <claus.jensen@microsemi.com>
CC: David Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 2a6da3e5483f6..e33349701050d 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -1647,7 +1647,6 @@ out:
 	if (!err) {
 		ICMP6MSGOUT_INC_STATS(net, idev, ICMPV6_MLD2_REPORT);
 		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);
-		IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUTMCAST, payload_len);
 	} else {
 		IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);
 	}
@@ -2010,7 +2009,6 @@ out:
 	if (!err) {
 		ICMP6MSGOUT_INC_STATS(net, idev, type);
 		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);
-		IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUTMCAST, full_len);
 	} else
 		IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);