lkml.org 
[lkml]   [2015]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2 20/61] snmp: Remove duplicate OUTMCAST stat increment
    Date
    4.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Neil Horman <nhorman@tuxdriver.com>

    [ 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv6/mcast.c | 2 --
    1 file changed, 2 deletions(-)

    --- a/net/ipv6/mcast.c
    +++ b/net/ipv6/mcast.c
    @@ -1651,7 +1651,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);
    }
    @@ -2014,7 +2013,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);




    \
     
     \ /
      Last update: 2015-12-12 21:21    [W:4.522 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site