[3.8.y.z extended stable] Patch "net_sched: htb: fix a typo in htb_change_class()" has been added to staging queue

Kamal Mostafa kamal at canonical.com
Mon Oct 28 21:59:28 UTC 2013


This is a note to let you know that I have just added a patch titled

    net_sched: htb: fix a typo in htb_change_class()

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

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.8.y-queue

This patch is scheduled to be released in version 3.8.13.12.

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

For more information about the 3.8.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From 6849c3600fe761470430ecb5d089ea709400a444 Mon Sep 17 00:00:00 2001
From: Vimalkumar <j.vimal at gmail.com>
Date: Tue, 10 Sep 2013 17:36:37 -0700
Subject: net_sched: htb: fix a typo in htb_change_class()

[ Upstream commit f3ad857e3da1abaea780dc892b592cd86c541c52 ]

Fix a typo added in commit 56b765b79 ("htb: improved accuracy at high
rates")

cbuffer should not be a copy of buffer.

Signed-off-by: Vimalkumar <j.vimal at gmail.com>
Signed-off-by: Eric Dumazet <edumazet at google.com>
Cc: Jesper Dangaard Brouer <brouer at redhat.com>
Cc: Jiri Pirko <jpirko at redhat.com>
Reviewed-by: Jiri Pirko <jiri at resnulli.us>
Signed-off-by: David S. Miller <davem at davemloft.net>
[ kamal: backport to 3.8 ]
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 net/sched/sch_htb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 8ea8a79..ef085f1 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1513,7 +1513,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
 	htb_precompute_ratedata(&cl->ceil);

 	cl->buffer = hopt->buffer << PSCHED_SHIFT;
-	cl->cbuffer = hopt->buffer << PSCHED_SHIFT;
+	cl->cbuffer = hopt->cbuffer << PSCHED_SHIFT;

 	sch_tree_unlock(sch);

--
1.8.1.2





More information about the kernel-team mailing list