From patchwork Mon Oct 28 21:59:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 286680 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 6DE4B2C00A7 for ; Tue, 29 Oct 2013 09:02:09 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Vausu-00046c-22; Mon, 28 Oct 2013 22:02:04 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VauqR-0002pi-8Z for kernel-team@lists.ubuntu.com; Mon, 28 Oct 2013 21:59:31 +0000 Received: from c-67-160-231-162.hsd1.ca.comcast.net ([67.160.231.162] helo=fourier) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1VauqQ-0004gY-RR; Mon, 28 Oct 2013 21:59:31 +0000 Received: from kamal by fourier with local (Exim 4.80) (envelope-from ) id 1VauqO-0005Mi-6O; Mon, 28 Oct 2013 14:59:28 -0700 From: Kamal Mostafa To: Vimalkumar Subject: [3.8.y.z extended stable] Patch "net_sched: htb: fix a typo in htb_change_class()" has been added to staging queue Date: Mon, 28 Oct 2013 14:59:28 -0700 Message-Id: <1382997568-20594-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.8.1.2 X-Extended-Stable: 3.8 Cc: Jiri Pirko , Jiri Pirko , Kamal Mostafa , kernel-team@lists.ubuntu.com, Eric Dumazet , Jesper Dangaard Brouer , "David S. Miller" X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 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 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 Signed-off-by: Eric Dumazet Cc: Jesper Dangaard Brouer Cc: Jiri Pirko Reviewed-by: Jiri Pirko Signed-off-by: David S. Miller [ kamal: backport to 3.8 ] Signed-off-by: Kamal Mostafa --- net/sched/sch_htb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.1.2 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);