diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-24 00:20:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:53:35 -0500 |
commit | b24b8a247ff65c01b252025926fe564209fae4fc (patch) | |
tree | 8a9e0ea1e24b4733d8b9433d41877659505e9da4 /net/sched/sch_sfq.c | |
parent | a92aa318b4b369091fd80433c80e62838db8bc1c (diff) |
[NET]: Convert init_timer into setup_timer
Many-many code in the kernel initialized the timer->function
and timer->data together with calling init_timer(timer). There
is already a helper for this. Use it for networking code.
The patch is HUGE, but makes the code 130 lines shorter
(98 insertions(+), 228 deletions(-)).
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_sfq.c')
-rw-r--r-- | net/sched/sch_sfq.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index b542c875e154..65293876cd66 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c | |||
@@ -426,9 +426,7 @@ static int sfq_init(struct Qdisc *sch, struct rtattr *opt) | |||
426 | struct sfq_sched_data *q = qdisc_priv(sch); | 426 | struct sfq_sched_data *q = qdisc_priv(sch); |
427 | int i; | 427 | int i; |
428 | 428 | ||
429 | init_timer(&q->perturb_timer); | 429 | setup_timer(&q->perturb_timer, sfq_perturbation, (unsigned long)sch); |
430 | q->perturb_timer.data = (unsigned long)sch; | ||
431 | q->perturb_timer.function = sfq_perturbation; | ||
432 | 430 | ||
433 | for (i=0; i<SFQ_HASH_DIVISOR; i++) | 431 | for (i=0; i<SFQ_HASH_DIVISOR; i++) |
434 | q->ht[i] = SFQ_DEPTH; | 432 | q->ht[i] = SFQ_DEPTH; |