From patchwork Sat Feb 9 16:45:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 219402 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 4D2172C0087 for ; Sun, 10 Feb 2013 03:45:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932416Ab3BIQp1 (ORCPT ); Sat, 9 Feb 2013 11:45:27 -0500 Received: from mail-ea0-f173.google.com ([209.85.215.173]:54355 "EHLO mail-ea0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932324Ab3BIQp0 (ORCPT ); Sat, 9 Feb 2013 11:45:26 -0500 Received: by mail-ea0-f173.google.com with SMTP id i1so2077477eaa.4 for ; Sat, 09 Feb 2013 08:45:23 -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=RY0a1DDeDmGmiOgqf1SSQOidUClO9eQhqPdspRJl36jDg8WQNNPhWovW6CLFXf7GvR 7BSvlky8L4nX5463fWQtJBuGgdN450I7diD4zJfI6xet4Hmc/WCIsBkBEXnp44l5zm9K fVKaBHFSkRpeZf4AZGIQ7qsTxxJKoJm1gyL5xkTiwcyiKuYRC+f/+NZrQDVxbD0qmA54 K3UT/DgsJZktt1ME9C7/z207h+zxKdLjuBfmmX2ojZB2eNPOuzVl0v8XxM6fg71jr4KL 8hQGe5OMgPwHgNA7O49oK/7/6Or5Uzg635LBMg4uJsmSsYl9aXDdxjFnXMw68nd19kei CiZw== X-Received: by 10.14.210.132 with SMTP id u4mr29020669eeo.19.1360428323256; Sat, 09 Feb 2013 08:45:23 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id f6sm53148389eeo.7.2013.02.09.08.45.21 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 09 Feb 2013 08:45:22 -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 02/11] htb: fix values in opt dump Date: Sat, 9 Feb 2013 17:45:03 +0100 Message-Id: <1360428312-1277-3-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: ALoCoQk5qd4Jt9cHZZT9AoYDQtjHf4phUgJGR6VTTy6naZvCsH8pqr6MEl+5Ef6EydhxPzdHIdUY 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;