diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2015-11-16 13:09:10 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-12-30 02:26:01 +0000 |
| commit | ca194f27b9dcd0d389b83f27c3a5c84caacb6246 (patch) | |
| tree | 6c60f74de4c8cfdd1678684d82fe2bbe2962c0ec | |
| parent | 3953ba754ad4e00a58fbc20a9498c999ffe82f61 (diff) | |
| download | linux-ca194f27b9dcd0d389b83f27c3a5c84caacb6246.tar.gz linux-ca194f27b9dcd0d389b83f27c3a5c84caacb6246.tar.bz2 linux-ca194f27b9dcd0d389b83f27c3a5c84caacb6246.zip | |
snmp: Remove duplicate OUTMCAST stat increment
[ 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
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: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | net/ipv6/mcast.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 7bb66447735f..9129a7c8fe36 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -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); } @@ -1811,7 +1810,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); |