diff --git a/[refs] b/[refs]
index 147c4f5f1594..c6c3dfb795f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9bef55d3d062ee7a78fde2913ec87ca9305a1e0
+refs/heads/master: e08b09983fe9cf379faf1aefdf9164268d4610e7
diff --git a/trunk/include/linux/pkt_sched.h b/trunk/include/linux/pkt_sched.h
index 268c51599eb8..919af93b7059 100644
--- a/trunk/include/linux/pkt_sched.h
+++ b/trunk/include/linux/pkt_sched.h
@@ -77,8 +77,8 @@ struct tc_ratespec
 {
 	unsigned char	cell_log;
 	unsigned char	__reserved;
-	unsigned short	feature;
-	short		addend;
+	unsigned short	overhead;
+	short		cell_align;
 	unsigned short	mpu;
 	__u32		rate;
 };
diff --git a/trunk/include/net/sch_generic.h b/trunk/include/net/sch_generic.h
index 4ebd615bd013..a02ec9e5fea5 100644
--- a/trunk/include/net/sch_generic.h
+++ b/trunk/include/net/sch_generic.h
@@ -307,7 +307,9 @@ static inline int qdisc_reshape_fail(struct sk_buff *skb, struct Qdisc *sch)
  */
 static inline u32 qdisc_l2t(struct qdisc_rate_table* rtab, unsigned int pktlen)
 {
-	int slot = pktlen;
+	int slot = pktlen + rtab->rate.cell_align + rtab->rate.overhead;
+	if (slot < 0)
+		slot = 0;
 	slot >>= rtab->rate.cell_log;
 	if (slot > 255)
 		return (rtab->data[255]*(slot >> 8) + rtab->data[slot & 0xFF]);