snmp: Remove duplicate OUTMCAST stat increment
authorNeil Horman <nhorman@tuxdriver.com>
Mon, 16 Nov 2015 18:09:10 +0000 (13:09 -0500)
committerJiri Slaby <jslaby@suse.cz>
Tue, 5 Jan 2016 15:11:09 +0000 (16:11 +0100)
[ 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: Jiri Slaby <jslaby@suse.cz>
net/ipv6/mcast.c

index d81abd5ba767e8c89623ff41991a4dbffed3597e..452b6a1cc0988e9bdbef19550c7d2045d4e092d8 100644 (file)
@@ -1622,7 +1622,6 @@ static void mld_sendpack(struct sk_buff *skb)
        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);
        }
@@ -1986,7 +1985,6 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
        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);