diff options
author | Jiri Pirko <jiri@resnulli.us> | 2013-02-11 19:12:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-12 18:59:44 -0500 |
commit | b9a7afdefdf90dc9e64902b2565170b8b017aa75 (patch) | |
tree | df395f6a6abdab955ea9e8f04183469bf1383f3f /net/sched/sch_htb.c | |
parent | bdd6998b1e050f5589562e40aa852b626ee6fdea (diff) |
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/sch_htb.c')
-rw-r--r-- | net/sched/sch_htb.c | 4 |
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, | |||
1459 | cl->parent = parent; | 1459 | cl->parent = parent; |
1460 | 1460 | ||
1461 | /* set class to be in HTB_CAN_SEND state */ | 1461 | /* set class to be in HTB_CAN_SEND state */ |
1462 | cl->tokens = hopt->buffer; | 1462 | cl->tokens = PSCHED_TICKS2NS(hopt->buffer); |
1463 | cl->ctokens = hopt->cbuffer; | 1463 | cl->ctokens = PSCHED_TICKS2NS(hopt->cbuffer); |
1464 | cl->mbuffer = 60 * PSCHED_TICKS_PER_SEC; /* 1min */ | 1464 | cl->mbuffer = 60 * PSCHED_TICKS_PER_SEC; /* 1min */ |
1465 | cl->t_c = psched_get_time(); | 1465 | cl->t_c = psched_get_time(); |
1466 | cl->cmode = HTB_CAN_SEND; | 1466 | cl->cmode = HTB_CAN_SEND; |