diff --git a/[refs] b/[refs]
index e392e98a3488..887fc777fd1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 324f5aa52814b3cc0b24eec071be2946dbca0e3a
+refs/heads/master: bdd6998b1e050f5589562e40aa852b626ee6fdea
diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c
index 14a83dc0bfff..547912e94038 100644
--- a/trunk/net/sched/sch_htb.c
+++ b/trunk/net/sched/sch_htb.c
@@ -1503,9 +1503,6 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
 			cl->prio = TC_HTB_NUMPRIO - 1;
 	}
 
-	cl->buffer = hopt->buffer;
-	cl->cbuffer = hopt->cbuffer;
-
 	cl->rate.rate_bps = (u64)hopt->rate.rate << 3;
 	cl->ceil.rate_bps = (u64)hopt->ceil.rate << 3;