From patchwork Tue Feb 12 10:12:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 219760 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 524D22C0320 for ; Tue, 12 Feb 2013 21:12:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932839Ab3BLKMY (ORCPT ); Tue, 12 Feb 2013 05:12:24 -0500 Received: from mail-ea0-f177.google.com ([209.85.215.177]:57658 "EHLO mail-ea0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932782Ab3BLKMX (ORCPT ); Tue, 12 Feb 2013 05:12:23 -0500 Received: by mail-ea0-f177.google.com with SMTP id n13so71633eaa.36 for ; Tue, 12 Feb 2013 02:12:21 -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=9Bsh+qggcZYXbI35KxPhHDSlsNnHoTVd9OFFFh1LeQU=; b=WFHBdXl2KxYHQUOS2MOvqGi7amuC/SmYu8vJ+3FhT9GYXfYexMLzsjkKfuQYUenabO XRSremfM3z9MyE2rByXPH88lfqbBQH+FDaSUPkzvTU2zo8TZqnkKrP4Nl5ZNtwCTZdVe EVKSzMGbfbKmvfnmHO8d8hFLdV91lpraxoSMm+i2S6zr1RnxC+za7O+lOKfLx+fpjLKy wrBtWVR3XAresDiOIZXU52TZ5TuDf5AoAVbmW6U6PkRjIuEAQ+91/zQ1Lmu3UnngIhpe T8bxnYdesvsKe4pOCxFQ+yS7tlb8h6sw/TMiI00J8y8A7yS4cOQJdIWBw6OVsrCF0CXW pYig== X-Received: by 10.14.219.6 with SMTP id l6mr60619081eep.23.1360663941097; Tue, 12 Feb 2013 02:12:21 -0800 (PST) Received: from localhost (ip-94-112-98-141.net.upcbroadband.cz. [94.112.98.141]) by mx.google.com with ESMTPS id 44sm66974553eek.5.2013.02.12.02.12.19 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 12 Feb 2013 02:12:20 -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 02/11] htb: fix values in opt dump Date: Tue, 12 Feb 2013 11:12:00 +0100 Message-Id: <1360663929-1023-3-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: ALoCoQkjsL/6o/IzS6Pqg5OIhE//pboSzrafZjAFAc12t1XyduSbNR2d/WcSMHYxi2WoMs/ZpvoG Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org in htb_change_class() cl->buffer and cl->buffer are stored in ns. So in dump, convert them back to psched ticks. Note this was introduced by: commit 56b765b79e9a78dc7d3f8850ba5e5567205a3ecd htb: improved accuracy at high rates Please consider this for -net/-stable. 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 476992c..14a83dc 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -1135,9 +1135,9 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg, memset(&opt, 0, sizeof(opt)); opt.rate.rate = cl->rate.rate_bps >> 3; - opt.buffer = cl->buffer; + opt.buffer = PSCHED_NS2TICKS(cl->buffer); opt.ceil.rate = cl->ceil.rate_bps >> 3; - opt.cbuffer = cl->cbuffer; + opt.cbuffer = PSCHED_NS2TICKS(cl->cbuffer); opt.quantum = cl->quantum; opt.prio = cl->prio; opt.level = cl->level;