mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 23:30:53 +07:00
rose: Use sock_graft() and remove bogus sk_socket and sk_sleep init.
This is the rose 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:
parent
7b66767f96
commit
44ccff1f53
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user