diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-17 02:36:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-17 02:36:44 -0700 |
| commit | 7b66767f969edcbdd573aca8063beee7534d242b (patch) | |
| tree | 0855036bb8a3573a6eff996f9bc6ace1b1284e8a /net/netrom | |
| parent | 9375cb8a1232d2a15fe34bec4d3474872e02faec (diff) | |
| download | kernel_samsung_espresso10-7b66767f969edcbdd573aca8063beee7534d242b.zip kernel_samsung_espresso10-7b66767f969edcbdd573aca8063beee7534d242b.tar.gz kernel_samsung_espresso10-7b66767f969edcbdd573aca8063beee7534d242b.tar.bz2 | |
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 <davem@davemloft.net>
Diffstat (limited to 'net/netrom')
| -rw-r--r-- | net/netrom/af_netrom.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 4bae8b9..5877962 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); |