netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH]: Make LLC use sock_graft()
@ 2008-06-17  8:22 David Miller
  2008-06-17 12:11 ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 2+ messages in thread
From: David Miller @ 2008-06-17  8:22 UTC (permalink / raw)
  To: netdev; +Cc: acme


Applied and pushed out to net-next-2.6

llc: Use sock_graft() instead of by-hand version.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/llc/af_llc.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-06-17 12:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-17  8:22 [PATCH]: Make LLC use sock_graft() David Miller
2008-06-17 12:11 ` Arnaldo Carvalho de Melo

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).