From patchwork Sun Feb 10 10:52:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 219479 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 179632C00DC for ; Sun, 10 Feb 2013 21:52:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754323Ab3BJKww (ORCPT ); Sun, 10 Feb 2013 05:52:52 -0500 Received: from mail-ee0-f44.google.com ([74.125.83.44]:43388 "EHLO mail-ee0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754571Ab3BJKwu (ORCPT ); Sun, 10 Feb 2013 05:52:50 -0500 Received: by mail-ee0-f44.google.com with SMTP id l10so2752149eei.17 for ; Sun, 10 Feb 2013 02:52:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=GxjZjvx1mqMHTJVpz3BFI9yPF4wHVFNh1+Wj9ZERwn4=; b=A7Xt0aYK1EJPtIp3qrOyJR6/xwQJF7ezmbc1dQA+ggJsVy1r3EBZOIshsVoAHGAhAW KfQgfyuoNB3jzmZe/b+rB0fZSUyj/ZZPeepRY4hvacUNrN2keHU4uVygr/3b5ud4Ef73 w7hsdUKkWFlqsq7xT9AoEBUcs2RJU2iz2Y6u0bjkt9OkogBmtg1St9H7MXYgwxQeII8q IuDV3tDinlgvPmKXcMHHCunGpC6pw0B6M3VquQ/7ThDJ8oPpPSfuJzWJLKBktX+Kzyel WRtXJG/Mzjoedd8g0GDPgHtRX0lJfgeRKkTkLxlyHyyTsORffdYGYvOBdNtz5WDrTeZy FOaw== X-Received: by 10.14.182.5 with SMTP id n5mr36951308eem.9.1360493568812; Sun, 10 Feb 2013 02:52:48 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id q42sm47383838eem.14.2013.02.10.02.52.47 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 10 Feb 2013 02:52:48 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, jhs@mojatatu.com, kuznet@ms2.inr.ac.ru, j.vimal@gmail.com Subject: [patch net-next v4 04/11] htb: initialize cl->tokens and cl->ctokens correctly Date: Sun, 10 Feb 2013 11:52:12 +0100 Message-Id: <1360493539-14868-5-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360493539-14868-1-git-send-email-jiri@resnulli.us> References: <1360493539-14868-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQm7be7/9KqDryiqoRHv1gHuVlWboKHYtppmZisSqQqYLXzZV1ZC81fvLAtsEJ0McqqP6HWP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org These are in ns so convert from ticks to ns. Signed-off-by: Jiri Pirko Acked-by: Eric Dumazet --- net/sched/sch_htb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 547912e9..2b22544 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -1459,8 +1459,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, cl->parent = parent; /* set class to be in HTB_CAN_SEND state */ - cl->tokens = hopt->buffer; - cl->ctokens = hopt->cbuffer; + cl->tokens = PSCHED_TICKS2NS(hopt->buffer); + cl->ctokens = PSCHED_TICKS2NS(hopt->cbuffer); cl->mbuffer = 60 * PSCHED_TICKS_PER_SEC; /* 1min */ cl->t_c = psched_get_time(); cl->cmode = HTB_CAN_SEND;