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/dccp/timer.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/dccp/timer.c')
-rw-r--r-- | net/dccp/timer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/dccp/timer.c b/net/dccp/timer.c index 3af067354bd4..8703a792b560 100644 --- a/net/dccp/timer.c +++ b/net/dccp/timer.c | |||
@@ -280,9 +280,8 @@ static void dccp_init_write_xmit_timer(struct sock *sk) | |||
280 | { | 280 | { |
281 | struct dccp_sock *dp = dccp_sk(sk); | 281 | struct dccp_sock *dp = dccp_sk(sk); |
282 | 282 | ||
283 | init_timer(&dp->dccps_xmit_timer); | 283 | setup_timer(&dp->dccps_xmit_timer, dccp_write_xmit_timer, |
284 | dp->dccps_xmit_timer.data = (unsigned long)sk; | 284 | (unsigned long)sk); |
285 | dp->dccps_xmit_timer.function = dccp_write_xmit_timer; | ||
286 | } | 285 | } |
287 | 286 | ||
288 | void dccp_init_xmit_timers(struct sock *sk) | 287 | void dccp_init_xmit_timers(struct sock *sk) |