lkml.org 
[lkml]   [2016]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 09/91] snmp: Remove duplicate OUTMCAST stat increment
    Date
    From: Neil Horman <nhorman@tuxdriver.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    [ 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 | 2 --
    1 file changed, 2 deletions(-)

    diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
    index d81abd5ba767..452b6a1cc098 100644
    --- a/net/ipv6/mcast.c
    +++ b/net/ipv6/mcast.c
    @@ -1622,7 +1622,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);
    }
    @@ -1986,7 +1985,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);

    --
    2.6.4


    \
     
     \ /
      Last update: 2016-01-05 19:21    [W:2.294 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site