From patchwork Fri Feb 8 18:59:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 219247 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 993222C007A for ; Sat, 9 Feb 2013 05:59:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760249Ab3BHS7w (ORCPT ); Fri, 8 Feb 2013 13:59:52 -0500 Received: from mail-ee0-f50.google.com ([74.125.83.50]:61270 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760225Ab3BHS7v (ORCPT ); Fri, 8 Feb 2013 13:59:51 -0500 Received: by mail-ee0-f50.google.com with SMTP id e51so2216657eek.23 for ; Fri, 08 Feb 2013 10:59:50 -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=4hPUN38NxXi43es4Ml6lylJeZoX2Wp419CRFyQsVQfs=; b=QAhToxs3q0+xq+lkIuR5jtKYp7c3xMC2TqCq3jnDbcrz3lXIJm52SL7UXE1yYbVOuG MFoZP372Ca87prOHXYQJwUlCQWh8yOrezNJxpA6qJZwn8LeuNXX1xXLNiV2BpX8IHxl5 0Bs6HEsmr+Bqv0NW3OrbxkkuE+roqtgctmlTjs0vlLcQljgvy39pMgIjUMLQHcZ7kyHd DctZFCOOFgdsiY2hRdDcAaaH242DR5/vdkFPW84QwAAcZWLNXirnV29Ip0dXQtYR2C33 3njAAlJobx1sKaVfhrDUZjAXLIYUJX6LvadDYF37h64x6HbOxMcotSkN+CEYWAwxjv4X VJOA== X-Received: by 10.14.202.197 with SMTP id d45mr19143356eeo.1.1360349990096; Fri, 08 Feb 2013 10:59:50 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id a1sm23484324eep.2.2013.02.08.10.59.48 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 08 Feb 2013 10:59:49 -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 v2 01/11] htb: use PSCHED_TICKS2NS() Date: Fri, 8 Feb 2013 19:59:31 +0100 Message-Id: <1360349981-27801-2-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360349981-27801-1-git-send-email-jiri@resnulli.us> References: <1360349981-27801-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQnU37s3I+tFKvDZ4wRCCTo8I+t+8I5/sgVdOKTR1mSamamJI3HMd3pCzychKOPFgJCAnCR1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 51561ea..476992c 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -1512,8 +1512,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, htb_precompute_ratedata(&cl->rate); htb_precompute_ratedata(&cl->ceil); - cl->buffer = hopt->buffer << PSCHED_SHIFT; - cl->cbuffer = hopt->buffer << PSCHED_SHIFT; + cl->buffer = PSCHED_TICKS2NS(hopt->buffer); + cl->cbuffer = PSCHED_TICKS2NS(hopt->buffer); sch_tree_unlock(sch);