| Message ID | 1360328327-7144-3-git-send-email-jiri@resnulli.us |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On Fri, 2013-02-08 at 13:58 +0100, Jiri Pirko wrote: > in htb_change_class() cl->buffer and cl->buffer are stored in ns. > So in dump, convert them back to psched ticks. > > Signed-off-by: Jiri Pirko <jiri@resnulli.us> > --- > 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; Acked-by: Eric Dumazet <edumazet@google.com> Isnt it a patch for net tree (and stable) ? A bug origin (commit id/title) is welcomed to ease stable team work. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Fri, Feb 08, 2013 at 04:54:09PM CET, eric.dumazet@gmail.com wrote: >On Fri, 2013-02-08 at 13:58 +0100, Jiri Pirko wrote: >> in htb_change_class() cl->buffer and cl->buffer are stored in ns. >> So in dump, convert them back to psched ticks. >> >> Signed-off-by: Jiri Pirko <jiri@resnulli.us> >> --- >> 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; > >Acked-by: Eric Dumazet <edumazet@google.com> > >Isnt it a patch for net tree (and stable) ? That may be. > >A bug origin (commit id/title) is welcomed to ease stable team work. Okay. I will repost the patchset anyway because I misspelled "peak" (and I will probably add similar patches I did for tbf for act_police). I will include your acks and commit id/title. Jiri > > > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
in htb_change_class() cl->buffer and cl->buffer are stored in ns. So in dump, convert them back to psched ticks. Signed-off-by: Jiri Pirko <jiri@resnulli.us> --- net/sched/sch_htb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)