diff options
-rw-r--r-- | net/sched/sch_htb.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 80cb94d9c299..fcd06e29e8b3 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
@@ -125,13 +125,6 @@ struct htb_class { | |||
125 | psched_time_t t_c; /* checkpoint time */ | 125 | psched_time_t t_c; /* checkpoint time */ |
126 | }; | 126 | }; |
127 | 127 | ||
128 | static inline long L2T(struct htb_class *cl, struct qdisc_rate_table *rate, | ||
129 | int size) | ||
130 | { | ||
131 | long result = qdisc_l2t(rate, size); | ||
132 | return result; | ||
133 | } | ||
134 | |||
135 | struct htb_sched { | 128 | struct htb_sched { |
136 | struct Qdisc_class_hash clhash; | 129 | struct Qdisc_class_hash clhash; |
137 | struct list_head drops[TC_HTB_NUMPRIO];/* active leaves (for drops) */ | 130 | struct list_head drops[TC_HTB_NUMPRIO];/* active leaves (for drops) */ |
@@ -604,7 +597,7 @@ static void htb_charge_class(struct htb_sched *q, struct htb_class *cl, | |||
604 | 597 | ||
605 | #define HTB_ACCNT(T,B,R) toks = diff + cl->T; \ | 598 | #define HTB_ACCNT(T,B,R) toks = diff + cl->T; \ |
606 | if (toks > cl->B) toks = cl->B; \ | 599 | if (toks > cl->B) toks = cl->B; \ |
607 | toks -= L2T(cl, cl->R, bytes); \ | 600 | toks -= (long) qdisc_l2t(cl->R, bytes); \ |
608 | if (toks <= -cl->mbuffer) toks = 1-cl->mbuffer; \ | 601 | if (toks <= -cl->mbuffer) toks = 1-cl->mbuffer; \ |
609 | cl->T = toks | 602 | cl->T = toks |
610 | 603 | ||