diff options
author | David S. Miller <davem@davemloft.net> | 2008-06-17 03:05:13 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-06-17 03:05:13 -0700 |
commit | c751e4f8b32a3869bb4fec12100952abd9baa0e1 (patch) | |
tree | 2f930ab33e089bcde9b8fc12b272a6298a5e14e2 /net | |
parent | 0efffaf9d57f54a864b739176d1f659a69486e8b (diff) | |
download | linux-stable-c751e4f8b32a3869bb4fec12100952abd9baa0e1.tar.gz linux-stable-c751e4f8b32a3869bb4fec12100952abd9baa0e1.tar.bz2 linux-stable-c751e4f8b32a3869bb4fec12100952abd9baa0e1.zip |
x25: Use sock_orphan() instead of open-coded (and buggy) variant.
It doesn't grab the sk_callback_lock, it doesn't NULL out
the sk->sk_sleep waitqueue pointer, etc.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/x25/af_x25.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index bcb091f713ec..7b1c6ef04553 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -612,8 +612,7 @@ static int x25_release(struct socket *sock) break; } - sock->sk = NULL; - sk->sk_socket = NULL; /* Not used, but we should do this */ + sock_orphan(sk); out: return 0; } |