Skip to content

Commit

Permalink
netrom: Use sock_graft() and remove bogus sk_socket and sk_sleep init.
Browse files Browse the repository at this point in the history
This is the netrom variant of changeset
9375cb8
("ax25: Use sock_graft() and remove bogus sk_socket and sk_sleep init.")

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
davem330 committed Jun 17, 2008
1 parent 9375cb8 commit 7b66767
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions net/netrom/af_netrom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 7b66767

Please sign in to comment.