* [patch 4/9] X.25: Stop x25_destroy_socket timer looping
@ 2004-10-28 7:19 akpm
2004-10-28 23:45 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: akpm @ 2004-10-28 7:19 UTC (permalink / raw)
To: davem; +Cc: jgarzik, netdev, akpm, ahendry
From: Andrew Hendry <ahendry@tusc.com.au>
The sk_timer.data for the x.25 destroy_socket timer went missing at some
stage, causing a timer loop where x25_destroy_socket would keep setting up
timers to call itself. This patch puts the sk_timer.data back.
Signed-off-by: Andrew Hendry <ahendry@tusc.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/net/x25/af_x25.c | 1 +
1 files changed, 1 insertion(+)
diff -puN net/x25/af_x25.c~x25-stop-x25_destroy_socket-timer-looping net/x25/af_x25.c
--- 25/net/x25/af_x25.c~x25-stop-x25_destroy_socket-timer-looping 2004-10-28 00:17:07.879606104 -0700
+++ 25-akpm/net/x25/af_x25.c 2004-10-28 00:17:07.883605496 -0700
@@ -347,6 +347,7 @@ void x25_destroy_socket(struct sock *sk)
/* Defer: outstanding buffers */
sk->sk_timer.expires = jiffies + 10 * HZ;
sk->sk_timer.function = x25_destroy_timer;
+ sk->sk_timer.data = (unsigned long)sk;
add_timer(&sk->sk_timer);
} else {
/* drop last reference so sock_put will free */
_
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch 4/9] X.25: Stop x25_destroy_socket timer looping
2004-10-28 7:19 [patch 4/9] X.25: Stop x25_destroy_socket timer looping akpm
@ 2004-10-28 23:45 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2004-10-28 23:45 UTC (permalink / raw)
To: akpm; +Cc: jgarzik, netdev, akpm, ahendry
On Thu, 28 Oct 2004 00:19:42 -0700
akpm@osdl.org wrote:
> From: Andrew Hendry <ahendry@tusc.com.au>
>
> The sk_timer.data for the x.25 destroy_socket timer went missing at some
> stage, causing a timer loop where x25_destroy_socket would keep setting up
> timers to call itself. This patch puts the sk_timer.data back.
>
> Signed-off-by: Andrew Hendry <ahendry@tusc.com.au>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-10-28 23:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-28 7:19 [patch 4/9] X.25: Stop x25_destroy_socket timer looping akpm
2004-10-28 23:45 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).