dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

netrom: Use sock_graft() and remove bogus sk_socket and sk_sleep init. 

This is the netrom variant of changeset
9375cb8a12
("ax25: Use sock_graft() and remove bogus sk_socket and sk_sleep init.")

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2008-06-17 02:36:44 -07:00
parent 9375cb8a12
commit 7b66767f96
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/netrom/af_netrom.c
View File

@ -475,13 +475,11 @@ static struct sock *nr_make_new(struct sock *osk)
sock_init_data(NULL, sk); sock_init_data(NULL, sk);
sk->sk_type = osk->sk_type; sk->sk_type = osk->sk_type;
sk->sk_socket = osk->sk_socket;
sk->sk_priority = osk->sk_priority; sk->sk_priority = osk->sk_priority;
sk->sk_protocol = osk->sk_protocol; sk->sk_protocol = osk->sk_protocol;
sk->sk_rcvbuf = osk->sk_rcvbuf; sk->sk_rcvbuf = osk->sk_rcvbuf;
sk->sk_sndbuf = osk->sk_sndbuf; sk->sk_sndbuf = osk->sk_sndbuf;
sk->sk_state = TCP_ESTABLISHED; sk->sk_state = TCP_ESTABLISHED;
sk->sk_sleep = osk->sk_sleep;
sock_copy_flags(sk, osk); sock_copy_flags(sk, osk);
skb_queue_head_init(&nr->ack_queue); 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; goto out_release;
newsk = skb->sk; newsk = skb->sk;
newsk->sk_socket = newsock; sock_graft(newsk, newsock);
newsk->sk_sleep = &newsock->wait;
/* Now attach up the new socket */ /* Now attach up the new socket */
kfree_skb(skb); kfree_skb(skb);
sk_acceptq_removed(sk); sk_acceptq_removed(sk);
newsock->sk = newsk;
out_release: out_release:
release_sock(sk); release_sock(sk);