diff options
| author | Jesper Dangaard Brouer <hawk@comx.dk> | 2007-09-12 16:35:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-11 01:49:20 +0200 |
| commit | e9bef55d3d062ee7a78fde2913ec87ca9305a1e0 (patch) | |
| tree | bb772650e7df49e94bd9c383b51f53bbb4e7bcab /net/sched/sch_htb.c | |
| parent | [SCTP] net/sctp/socket.c: make 3 variables static (diff) | |
| download | linux-e9bef55d3d062ee7a78fde2913ec87ca9305a1e0.tar.xz linux-e9bef55d3d062ee7a78fde2913ec87ca9305a1e0.zip | |
[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.c | 6 |
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 { static inline long L2T(struct htb_class *cl, struct qdisc_rate_table *rate, int size) { - int slot = size >> rate->rate.cell_log; - if (slot > 255) - return (rate->data[255]*(slot >> 8) + rate->data[slot & 0xFF]); - return rate->data[slot]; + long result = qdisc_l2t(rate, size); + return result; } struct htb_sched { |