hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
David S. Miller 2008-06-17 02:39:21 -07:00
parent 7b66767f96
commit 44ccff1f53
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/rose/af_rose.c
View File

@ -566,13 +566,11 @@ static struct sock *rose_make_new(struct sock *osk)
#endif #endif
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);
init_timer(&rose->timer); init_timer(&rose->timer);
@ -924,14 +922,12 @@ static int rose_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 */
skb->sk = NULL; skb->sk = NULL;
kfree_skb(skb); kfree_skb(skb);
sk->sk_ack_backlog--; sk->sk_ack_backlog--;
newsock->sk = newsk;
out_release: out_release:
release_sock(sk); release_sock(sk);