Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23cb913d authored by Jarek Poplawski's avatar Jarek Poplawski Committed by David S. Miller
Browse files

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: default avatarJarek Poplawski <jarkao2@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 244ef9b9

net/sched/sch_htb.c

+1 −8
Original line number Diff line number Diff line
@@ -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