netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiri Pirko <jiri@resnulli.us>
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	[thread overview]
Message-ID: <1360428312-1277-3-git-send-email-jiri@resnulli.us> (raw)
In-Reply-To: <1360428312-1277-1-git-send-email-jiri@resnulli.us>

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 <jiri@resnulli.us>
Acked-by: Eric Dumazet <edumazet@google.com>
---
 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;
-- 
1.8.1.2

  parent reply	other threads:[~2013-02-09 16:45 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-09 16:45 [patch net-next v3 00/11] couple of net/sched fixes+improvements Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 01/11] htb: use PSCHED_TICKS2NS() Jiri Pirko
2013-02-09 16:45 ` Jiri Pirko [this message]
2013-02-09 16:45 ` [patch net-next v3 03/11] htb: remove pointless first initialization of buffer and cbuffer Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 04/11] htb: initialize cl->tokens and cl->ctokens correctly Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 05/11] sch: make htb_rate_cfg and functions around that generic Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 06/11] tbf: improved accuracy at high rates Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 07/11] tbf: ignore max_size check for gso skbs Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 08/11] tbf: fix value set for q->ptokens Jiri Pirko
2013-02-10  1:30   ` Eric Dumazet
2013-02-10  8:18     ` Jiri Pirko
2013-02-10  8:21       ` Eric Dumazet
2013-02-10  8:51         ` Jiri Pirko
2013-02-10 18:00           ` Eric Dumazet
2013-02-10 18:37             ` Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 09/11] act_police: move struct tcf_police to act_police.c Jiri Pirko
2013-02-09 16:45 ` [patch net-next v3 10/11] act_police: improved accuracy at high rates Jiri Pirko
2013-02-10  1:33   ` Eric Dumazet
2013-02-09 16:45 ` [patch net-next v3 11/11] act_police: remove <=mtu check for gso skbs Jiri Pirko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1360428312-1277-3-git-send-email-jiri@resnulli.us \
    --to=jiri@resnulli.us \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=j.vimal@gmail.com \
    --cc=jhs@mojatatu.com \
    --cc=kuznet@ms2.inr.ac.ru \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).