X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fdccp%2Ftimer.c;h=8703a792b56068ec44e15804731d2a0366ce7873;hb=2aec609fb45e84d65bc8eabc7b650bbecb1cc179;hp=3af067354bd4ec531ab61f2b22cf4ecd01028552;hpb=e86908614f2c7fec401827e5cefd7a6ea9407f85;p=linux-2.6

diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index 3af067354b..8703a792b5 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)