Skip to contentSkip to conversation

Patch "snmp: Remove duplicate OUTMCAST stat increment" has been added to the 3.10-stable tree

PATCH [email protected] 1 participant 1 message Dec 11, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

snmp: Remove duplicate OUTMCAST stat increment

to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
snmp-remove-duplicate-outmcast-stat-increment.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Fri Dec 11 11:39:46 EST 2015

From: Neil Horman <[email protected]>
Date: Mon, 16 Nov 2015 13:09:10 -0500
Subject: snmp: Remove duplicate OUTMCAST stat increment

From: Neil Horman <[email protected]>

[ Upstream commit 41033f029e393a64e81966cbe34d66c6cf8a2e7e ]

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

---
 net/ipv6/mcast.c |    2 --
 1 file changed, 2 deletions(-)
net/ipv6/mcast.c +0 -2
@@ -1441,7 +1441,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);
 	}
@@ -1805,7 +1804,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);
 

Patches currently in stable-queue which might be from [email protected] are

queue-3.10/snmp-remove-duplicate-outmcast-stat-increment.patch queue-3.10/sctp-translate-host-order-to-network-order-when-setting-a-hmacid.patch