Skip to content

Commit

Permalink
rose: 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 rose 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
David S. Miller committed Jun 17, 2008
1 parent 7b66767 commit 44ccff1
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions net/rose/af_rose.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 44ccff1

Please sign in to comment.