---

yaml --- r: 122443 b: refs/heads/master c: 23cb913 h: refs/heads/master i: 122441: 5fc7a9f 122439: 5e862cf v: v3
git-mirror · Dec 4, 2008 · 6130ef2 · 6130ef2
1 parent 1eb9bef
commit 6130ef2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 244ef9b9176c7c7a095f4738d353a3a60b88097d
+refs/heads/master: 23cb913d25b20ed88b36a26f337cfdb4605e63f4
diff --git a/trunk/net/sched/sch_htb.c b/trunk/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