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/sctp/associola.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/sctp/associola.c')
-rw-r--r-- | net/sctp/associola.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 013e3d3ab0f1..33ae9b01131e 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
@@ -167,11 +167,9 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a | |||
167 | sp->autoclose * HZ; | 167 | sp->autoclose * HZ; |
168 | 168 | ||
169 | /* Initilizes the timers */ | 169 | /* Initilizes the timers */ |
170 | for (i = SCTP_EVENT_TIMEOUT_NONE; i < SCTP_NUM_TIMEOUT_TYPES; ++i) { | 170 | for (i = SCTP_EVENT_TIMEOUT_NONE; i < SCTP_NUM_TIMEOUT_TYPES; ++i) |
171 | init_timer(&asoc->timers[i]); | 171 | setup_timer(&asoc->timers[i], sctp_timer_events[i], |
172 | asoc->timers[i].function = sctp_timer_events[i]; | 172 | (unsigned long)asoc); |
173 | asoc->timers[i].data = (unsigned long) asoc; | ||
174 | } | ||
175 | 173 | ||
176 | /* Pull default initialization values from the sock options. | 174 | /* Pull default initialization values from the sock options. |
177 | * Note: This assumes that the values have already been | 175 | * Note: This assumes that the values have already been |