summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJarek Poplawski <jarkao2@gmail.com>2008-12-03 21:16:58 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-03 21:16:58 -0800
commit23cb913d25b20ed88b36a26f337cfdb4605e63f4 (patch)
treef7dafffe6f915bf2b808781b0447cc5c331813b7 /net
parent244ef9b9176c7c7a095f4738d353a3a60b88097d (diff)
downloadop-kernel-dev-23cb913d25b20ed88b36a26f337cfdb4605e63f4.zip
op-kernel-dev-23cb913d25b20ed88b36a26f337cfdb4605e63f4.tar.gz
pkt_sched: sch_htb: Remove L2T()
L2T() is currently used only in one place (and has one spurious parameter, btw), so let's: 'get rid of L2T completely, and just use "qdisc_l2t(rate, size)" directly.' - quote & feedback from David S. Miller. Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_htb.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 80cb94d..fcd06e2 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -125,13 +125,6 @@ struct htb_class {
psched_time_t t_c; /* checkpoint time */
};
-static inline long L2T(struct htb_class *cl, struct qdisc_rate_table *rate,
- int size)
-{
- long result = qdisc_l2t(rate, size);
- return result;
-}
-
struct htb_sched {
struct Qdisc_class_hash clhash;
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,
#define HTB_ACCNT(T,B,R) toks = diff + cl->T; \
if (toks > cl->B) toks = cl->B; \
- toks -= L2T(cl, cl->R, bytes); \
+ toks -= (long) qdisc_l2t(cl->R, bytes); \
if (toks <= -cl->mbuffer) toks = 1-cl->mbuffer; \
cl->T = toks
OpenPOWER on IntegriCloud