From 2b6adabfc19035e84c6807e27e2fdcaa269d0065 Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jiri@resnulli.us>
Date: Tue, 12 Feb 2013 00:12:02 +0000
Subject: [PATCH] --- yaml --- r: 352418 b: refs/heads/master c:
 b9a7afdefdf90dc9e64902b2565170b8b017aa75 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/sch_htb.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 887fc777fd1a..d18c76a8fc81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdd6998b1e050f5589562e40aa852b626ee6fdea
+refs/heads/master: b9a7afdefdf90dc9e64902b2565170b8b017aa75
diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c
index 547912e94038..2b225446b3de 100644
--- a/trunk/net/sched/sch_htb.c
+++ b/trunk/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;