summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2013-02-12 00:12:02 +0000
committerDavid S. Miller <davem@davemloft.net>2013-02-12 18:59:44 -0500
commitb9a7afdefdf90dc9e64902b2565170b8b017aa75 (patch)
treedf395f6a6abdab955ea9e8f04183469bf1383f3f /net/sched
parentbdd6998b1e050f5589562e40aa852b626ee6fdea (diff)
downloadlinux-b9a7afdefdf90dc9e64902b2565170b8b017aa75.tar.bz2
htb: initialize cl->tokens and cl->ctokens correctly
These are in ns so convert from ticks to ns. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_htb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 547912e94038..2b225446b3de 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1459,8 +1459,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
cl->parent = parent;
/* set class to be in HTB_CAN_SEND state */
- cl->tokens = hopt->buffer;
- cl->ctokens = hopt->cbuffer;
+ cl->tokens = PSCHED_TICKS2NS(hopt->buffer);
+ cl->ctokens = PSCHED_TICKS2NS(hopt->cbuffer);
cl->mbuffer = 60 * PSCHED_TICKS_PER_SEC; /* 1min */
cl->t_c = psched_get_time();
cl->cmode = HTB_CAN_SEND;