| Message ID | 20081203070947.GA5598@ff.dom.local |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Jarek Poplawski <jarkao2@gmail.com> Date: Wed, 3 Dec 2008 07:09:47 +0000 > L2T() is currently used only in one place, so let's move it closer to > this place, remove unused cl parameter, and change to a macro. > > Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Jarek, please just kill the macro and expand the calculation inline. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 80cb94d..78f20d6 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) */ @@ -602,9 +595,11 @@ static void htb_charge_class(struct htb_sched *q, struct htb_class *cl, long toks, diff; enum htb_cmode old_mode; +#define L2T(rate, size) ((long) qdisc_l2t(rate, size)) + #define HTB_ACCNT(T,B,R) toks = diff + cl->T; \ if (toks > cl->B) toks = cl->B; \ - toks -= L2T(cl, cl->R, bytes); \ + toks -= L2T(cl->R, bytes); \ if (toks <= -cl->mbuffer) toks = 1-cl->mbuffer; \ cl->T = toks
L2T() is currently used only in one place, so let's move it closer to this place, remove unused cl parameter, and change to a macro. Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> --- net/sched/sch_htb.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html