X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fx25%2Fx25_timer.c;h=d3e3e54db936a738d13de9756799796b40dc9dc3;hb=1c29dd9a9e2f83ffb02e50bb3619c3b9db8fd526;hp=2af190dc5b014ef8f544772d188c668e367f3a90;hpb=574009c1a895aeeb85eaab29c235d75852b09eb8;p=linux-2.6

diff --git a/net/x25/x25_timer.c b/net/x25/x25_timer.c
index 2af190dc5b..d3e3e54db9 100644
--- a/net/x25/x25_timer.c
+++ b/net/x25/x25_timer.c
@@ -33,9 +33,7 @@ void x25_init_timers(struct sock *sk)
 {
 	struct x25_sock *x25 = x25_sk(sk);
 
-	init_timer(&x25->timer);
-	x25->timer.data     = (unsigned long)sk;
-	x25->timer.function = &x25_timer_expiry;
+	setup_timer(&x25->timer, x25_timer_expiry, (unsigned long)sk);
 
 	/* initialized by sock_init_data */
 	sk->sk_timer.data     = (unsigned long)sk;