X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fappletalk%2Fddp.c;h=3be55c8ca4ef660f8cabab3786d0ace8daa4de9d;hb=5e226e4d9016daee170699f8a4188a5505021756;hp=e0d37d6dc1f81e6ec7455fe5d1f0c5acabc0ccd8;hpb=aac9e28d2f3d3c1eacc4114d685864a2a6423b80;p=linux-2.6 diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index e0d37d6dc1..3be55c8ca4 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -177,10 +177,9 @@ static inline void atalk_destroy_socket(struct sock *sk) if (atomic_read(&sk->sk_wmem_alloc) || atomic_read(&sk->sk_rmem_alloc)) { - init_timer(&sk->sk_timer); + setup_timer(&sk->sk_timer, atalk_destroy_timer, + (unsigned long)sk); sk->sk_timer.expires = jiffies + SOCK_DESTROY_TIME; - sk->sk_timer.function = atalk_destroy_timer; - sk->sk_timer.data = (unsigned long)sk; add_timer(&sk->sk_timer); } else sock_put(sk);