From: David S. Miller Date: Tue, 17 Jun 2008 09:36:44 +0000 (-0700) Subject: netrom: Use sock_graft() and remove bogus sk_socket and sk_sleep init. X-Git-Tag: v2.6.27-rc1~969^2~309 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7b66767f969edcbdd573aca8063beee7534d242b;p=linux-2.6-omap-h63xx.git netrom: Use sock_graft() and remove bogus sk_socket and sk_sleep init. This is the netrom variant of changeset 9375cb8a1232d2a15fe34bec4d3474872e02faec ("ax25: Use sock_graft() and remove bogus sk_socket and sk_sleep init.") Signed-off-by: David S. Miller --- diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 4bae8b998ca..58779624cdb 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -475,13 +475,11 @@ static struct sock *nr_make_new(struct sock *osk) sock_init_data(NULL, sk); sk->sk_type = osk->sk_type; - sk->sk_socket = osk->sk_socket; sk->sk_priority = osk->sk_priority; sk->sk_protocol = osk->sk_protocol; sk->sk_rcvbuf = osk->sk_rcvbuf; sk->sk_sndbuf = osk->sk_sndbuf; sk->sk_state = TCP_ESTABLISHED; - sk->sk_sleep = osk->sk_sleep; sock_copy_flags(sk, osk); skb_queue_head_init(&nr->ack_queue); @@ -810,13 +808,11 @@ static int nr_accept(struct socket *sock, struct socket *newsock, int flags) goto out_release; newsk = skb->sk; - newsk->sk_socket = newsock; - newsk->sk_sleep = &newsock->wait; + sock_graft(newsk, newsock); /* Now attach up the new socket */ kfree_skb(skb); sk_acceptq_removed(sk); - newsock->sk = newsk; out_release: release_sock(sk);