From patchwork Tue Feb 12 10:12:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 219762 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 7894E2C0320 for ; Tue, 12 Feb 2013 21:12:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932767Ab3BLKMa (ORCPT ); Tue, 12 Feb 2013 05:12:30 -0500 Received: from mail-ee0-f41.google.com ([74.125.83.41]:34009 "EHLO mail-ee0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932782Ab3BLKM2 (ORCPT ); Tue, 12 Feb 2013 05:12:28 -0500 Received: by mail-ee0-f41.google.com with SMTP id c13so3800865eek.0 for ; Tue, 12 Feb 2013 02:12:26 -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=GWgPT7WN4o/GduT0M9oo+5XQKg20cvf6RPc37bB/1ioiOsATapSzoZd3zqZNF9Silu uHkRV4MthDW0jmDehpJBzs0+bTxBeo4XlBuxChEaYKpUWQGtDRrjaP12t9X0zglj0g8O RWTItA/pMLBXLX5XZa6XtOE4JWf8UmmfABsYWx4v/JcZA/U/5D+ZrKYgCfZ/bDUza6d6 mjgZrMYda7X2/zrkXcT3Nki1G9YNAm/z9PlDOoZDH74exnvumEpLnOdsTU7nvfMuY9CF ufi1QFIyi4DQyVZkLsLlqQAowFmi1z6djm3IWyCuoABR/ErIP/3LE6GXqt9WglTalNQB oI1w== X-Received: by 10.14.218.71 with SMTP id j47mr60839751eep.28.1360663946828; Tue, 12 Feb 2013 02:12:26 -0800 (PST) Received: from localhost (ip-94-112-98-141.net.upcbroadband.cz. [94.112.98.141]) by mx.google.com with ESMTPS id m46sm2844802eeo.16.2013.02.12.02.12.24 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 12 Feb 2013 02:12:26 -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 v5 04/11] htb: initialize cl->tokens and cl->ctokens correctly Date: Tue, 12 Feb 2013 11:12:02 +0100 Message-Id: <1360663929-1023-5-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360663929-1023-1-git-send-email-jiri@resnulli.us> References: <1360663929-1023-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQkMKHV7mHbDnzO8X+CPUhJ/xDFxXyoTCX6quG4/ZaaKFtrEZ9wopw6QSmry/mr3SKoan3UH 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;