Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44ccff1f authored by David S. Miller's avatar David S. Miller
Browse files

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



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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7b66767f

net/rose/af_rose.c

+1 −5
Original line number Diff line number Diff line
@@ -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);