From 4519ecf4c52172686756a5141405eb754992ef18 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 17 Jun 2008 01:21:03 -0700
Subject: [PATCH] --- yaml --- r: 102988 b: refs/heads/master c:
 ee5850defcbd98d3a9cb3e0ae93511e7c89bdecd h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/llc/af_llc.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 84757993dea3..ed1df120b0b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 338db085518a8436cdecd33f7b52a06ec16d9ec1
+refs/heads/master: ee5850defcbd98d3a9cb3e0ae93511e7c89bdecd
diff --git a/trunk/net/llc/af_llc.c b/trunk/net/llc/af_llc.c
index 97101dcde4c0..5bcc452a247f 100644
--- a/trunk/net/llc/af_llc.c
+++ b/trunk/net/llc/af_llc.c
@@ -128,10 +128,8 @@ static int llc_ui_send_data(struct sock* sk, struct sk_buff *skb, int noblock)
 
 static void llc_ui_sk_init(struct socket *sock, struct sock *sk)
 {
+	sock_graft(sk, sock);
 	sk->sk_type	= sock->type;
-	sk->sk_sleep	= &sock->wait;
-	sk->sk_socket	= sock;
-	sock->sk	= sk;
 	sock->ops	= &llc_ui_ops;
 }