2.6.25-rc7

 net

 dccp

diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index 3af0673..8703a79 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)
 {
    struct dccp_sock *dp = dccp_sk(sk);
 
-   init_timer(&dp->dccps_xmit_timer);
-   dp->dccps_xmit_timer.data = (unsigned long)sk;
-   dp->dccps_xmit_timer.function = dccp_write_xmit_timer;
+   setup_timer(&dp->dccps_xmit_timer, dccp_write_xmit_timer,
+         (unsigned long)sk);
 }
 
 void dccp_init_xmit_timers(struct sock *sk)