diff mbox

[4.2.y-ckt,stable] Patch "sch_dsmark: update backlog as well" has been added to the 4.2.y-ckt tree

Message ID 1464112414-1332-1-git-send-email-kamal@canonical.com
State New
Headers show

Commit Message

Kamal Mostafa May 24, 2016, 5:53 p.m. UTC 
This is a note to let you know that I have just added a patch titled

    sch_dsmark: update backlog as well

to the linux-4.2.y-queue branch of the 4.2.y-ckt extended stable tree 
which can be found at:

    https://git.launchpad.net/~canonical-kernel/linux/+git/linux-stable-ckt/log/?h=linux-4.2.y-queue

This patch is scheduled to be released in version 4.2.8-ckt11.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 4.2.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

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

From 73090ba6d606e1c3c522631aeb7faaaff4f476e8 Mon Sep 17 00:00:00 2001
From: WANG Cong <xiyou.wangcong@gmail.com>
Date: Thu, 25 Feb 2016 14:55:03 -0800
Subject: sch_dsmark: update backlog as well

[ 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(+)

--
2.7.4
diff mbox

Patch

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;
 }