lkml.org 
[lkml]   [2016]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 44/53] sch_dsmark: update backlog as well
    Date
    4.2.8-ckt11 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: WANG Cong <xiyou.wangcong@gmail.com>

    [ Upstream commit bdf17661f63a79c3cb4209b970b1cc39e34f7543 ]

    Similarly, we need to update backlog too when we update qlen.

    Cc: Jamal Hadi Salim <jhs@mojatatu.com>
    Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    net/sched/sch_dsmark.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
    index d2084e7..7288dda 100644
    --- a/net/sched/sch_dsmark.c
    +++ b/net/sched/sch_dsmark.c
    @@ -256,6 +256,7 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch)
    return err;
    }

    + qdisc_qstats_backlog_inc(sch, skb);
    sch->q.qlen++;

    return NET_XMIT_SUCCESS;
    @@ -278,6 +279,7 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
    return NULL;

    qdisc_bstats_update(sch, skb);
    + qdisc_qstats_backlog_dec(sch, skb);
    sch->q.qlen--;

    index = skb->tc_index & (p->indices - 1);
    @@ -393,6 +395,7 @@ static void dsmark_reset(struct Qdisc *sch)

    pr_debug("%s(sch %p,[qdisc %p])\n", __func__, sch, p);
    qdisc_reset(p->q);
    + sch->qstats.backlog = 0;
    sch->q.qlen = 0;
    }

    --
    2.7.4
    \
     
     \ /
      Last update: 2016-05-24 20:21    [W:5.586 / U:0.452 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site