From 85d6d58d7f381bb5a85e46ee326ffc87b24dd4bb Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 17 Jun 2008 03:05:13 -0700
Subject: [PATCH] --- yaml --- r: 102994 b: refs/heads/master c:
 c751e4f8b32a3869bb4fec12100952abd9baa0e1 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/x25/af_x25.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4319b441165a..5cbc8be9b028 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0efffaf9d57f54a864b739176d1f659a69486e8b
+refs/heads/master: c751e4f8b32a3869bb4fec12100952abd9baa0e1
diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c
index bcb091f713ec..7b1c6ef04553 100644
--- a/trunk/net/x25/af_x25.c
+++ b/trunk/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;
 }