From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752525Ab3J2SFU (ORCPT ); Tue, 29 Oct 2013 14:05:20 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:59307 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751973Ab3J2SFQ (ORCPT ); Tue, 29 Oct 2013 14:05:16 -0400 From: Kamal Mostafa To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Vimalkumar , Eric Dumazet , Jesper Dangaard Brouer , Jiri Pirko , "David S. Miller" , Kamal Mostafa Subject: [PATCH 3.8 34/81] net_sched: htb: fix a typo in htb_change_class() Date: Tue, 29 Oct 2013 11:03:55 -0700 Message-Id: <1383069882-11437-35-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1383069882-11437-1-git-send-email-kamal@canonical.com> References: <1383069882-11437-1-git-send-email-kamal@canonical.com> X-Extended-Stable: 3.8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.8.13.12 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Vimalkumar [ 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(-) 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