diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-17 02:39:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-17 02:39:21 -0700 |
| commit | 44ccff1f539c8c5bbfc1eacd41cb9ef65022a4ca (patch) | |
| tree | 500bb91d30f0c4952788faa553099bfe7707e711 /net/rose | |
| parent | 7b66767f969edcbdd573aca8063beee7534d242b (diff) | |
| download | kernel-crypto-44ccff1f539c8c5bbfc1eacd41cb9ef65022a4ca.tar.gz kernel-crypto-44ccff1f539c8c5bbfc1eacd41cb9ef65022a4ca.tar.xz kernel-crypto-44ccff1f539c8c5bbfc1eacd41cb9ef65022a4ca.zip | |
rose: Use sock_graft() and remove bogus sk_socket and sk_sleep init.
This is the rose 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/rose')
| -rw-r--r-- | net/rose/af_rose.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 1ebf6529440..af86bcb604e 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -566,13 +566,11 @@ static struct sock *rose_make_new(struct sock *osk) #endif 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); init_timer(&rose->timer); @@ -924,14 +922,12 @@ static int rose_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 */ skb->sk = NULL; kfree_skb(skb); sk->sk_ack_backlog--; - newsock->sk = newsk; out_release: release_sock(sk); |