diff --git a/[refs] b/[refs]
index 1345121eb776..e392e98a3488 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f6d98c298d48eec29a32ae8ed6f4d896eb4f634
+refs/heads/master: 324f5aa52814b3cc0b24eec071be2946dbca0e3a
diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c
index 79e8ed4ac7ce..14a83dc0bfff 100644
--- a/trunk/net/sched/sch_htb.c
+++ b/trunk/net/sched/sch_htb.c
@@ -1512,8 +1512,8 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
 	htb_precompute_ratedata(&cl->rate);
 	htb_precompute_ratedata(&cl->ceil);
 
-	cl->buffer = hopt->buffer << PSCHED_SHIFT;
-	cl->cbuffer = hopt->buffer << PSCHED_SHIFT;
+	cl->buffer = PSCHED_TICKS2NS(hopt->buffer);
+	cl->cbuffer = PSCHED_TICKS2NS(hopt->buffer);
 
 	sch_tree_unlock(sch);