From: akpm@osdl.org
To: davem@redhat.com
Cc: jgarzik@pobox.com, netdev@oss.sgi.com, akpm@osdl.org,
ahendry@tusc.com.au
Subject: [patch 4/9] X.25: Stop x25_destroy_socket timer looping
Date: Thu, 28 Oct 2004 00:19:42 -0700 [thread overview]
Message-ID: <200410280721.i9S7Lf907993@mail.osdl.org> (raw)
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 */
_
next reply other threads:[~2004-10-28 7:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-10-28 7:19 akpm [this message]
2004-10-28 23:45 ` [patch 4/9] X.25: Stop x25_destroy_socket timer looping David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200410280721.i9S7Lf907993@mail.osdl.org \
--to=akpm@osdl.org \
--cc=ahendry@tusc.com.au \
--cc=davem@redhat.com \
--cc=jgarzik@pobox.com \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).