From patchwork Sat Feb 9 16:45: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: 219401 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 320812C0087 for ; Sun, 10 Feb 2013 03:45:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932401Ab3BIQpX (ORCPT ); Sat, 9 Feb 2013 11:45:23 -0500 Received: from mail-ea0-f179.google.com ([209.85.215.179]:46007 "EHLO mail-ea0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932324Ab3BIQpW (ORCPT ); Sat, 9 Feb 2013 11:45:22 -0500 Received: by mail-ea0-f179.google.com with SMTP id d12so1986555eaa.38 for ; Sat, 09 Feb 2013 08:45:20 -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=IeZEIqA7rilY0fzJdp0o91h57ub/uIp1HcSgCwnesVwXettMxICYYX7pdACikG4w7u RBsjloOm2/0p3xbujOGfRQa4W382VOWdm2YIcVQBTF9tsBDTNzWLHVPvL9ZgaN458DBU wJrLUPl/m8c8c2nAzWJ9zTAXMbLnt5GDm8+ktJSzod7S6c36rNCNrJHVLE554lPhvIzH L7J1t/j6i19QWbLkU45m+PkTfSBngFhp1sK/YeHFmveuPzQ4gQtnxkxa4IfVoAT/RbOJ 3zlpV3euLSvQ+W4jE8vDJfFkDrsrOInhyfDi83//rhYH+eZRcqgmQOIZli8w0BbWHUfC jKww== X-Received: by 10.14.206.132 with SMTP id l4mr28947769eeo.38.1360428320432; Sat, 09 Feb 2013 08:45:20 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id 44sm53149781eek.5.2013.02.09.08.45.18 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 09 Feb 2013 08:45:19 -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 v3 01/11] htb: use PSCHED_TICKS2NS() Date: Sat, 9 Feb 2013 17:45:02 +0100 Message-Id: <1360428312-1277-2-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360428312-1277-1-git-send-email-jiri@resnulli.us> References: <1360428312-1277-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQmKRqrq/vSYt9zB78viIU42AeQ0NtknvpsYGDWIRO6fsotbWMcmSjkWF7I4QsyNp1Suhhwr 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);