aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_htb.c
diff options
context:
space:
mode:
authorJesper Dangaard Brouer <hawk@comx.dk>2007-09-12 10:35:24 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:20 -0400
commite9bef55d3d062ee7a78fde2913ec87ca9305a1e0 (patch)
treebb772650e7df49e94bd9c383b51f53bbb4e7bcab /net/sched/sch_htb.c
parentb6fa1a4d746488a7de95ec16afcaf3247fedb003 (diff)
[NET_SCHED]: Cleanup L2T macros and handle oversized packets
Change L2T (length to time) macros, in all rate based schedulers, to call a common function qdisc_l2t() that does the rate table lookup. This function handles if the packet size lookup is larger than the rate table, which often occurs with TSO enabled. Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk> Acked-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_htb.c')
-rw-r--r--net/sched/sch_htb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 246a2f9765f1..5e608a64935a 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -132,10 +132,8 @@ struct htb_class {
132static inline long L2T(struct htb_class *cl, struct qdisc_rate_table *rate, 132static inline long L2T(struct htb_class *cl, struct qdisc_rate_table *rate,
133 int size) 133 int size)
134{ 134{
135 int slot = size >> rate->rate.cell_log; 135 long result = qdisc_l2t(rate, size);
136 if (slot > 255) 136 return result;
137 return (rate->data[255]*(slot >> 8) + rate->data[slot & 0xFF]);
138 return rate->data[slot];
139} 137}
140 138
141struct htb_sched { 139struct htb_sched {