Merge branch 'x86/core' into x86/xsave

[pandora-kernel.git] / net / llc / af_llc.c

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 97101dc..5bcc452 100644 (file)
--- a/net/llc/af_llc.c
+++ b/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;
 }