Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 22:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This is the x25 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:44:35 -07:00
parent 44ccff1f53
commit b61d38e055
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/x25/af_x25.c
View File

@ -555,13 +555,11 @@ static struct sock *x25_make_new(struct sock *osk)
x25 = x25_sk(sk); x25 = x25_sk(sk);
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;
sk->sk_backlog_rcv = osk->sk_backlog_rcv; sk->sk_backlog_rcv = osk->sk_backlog_rcv;
sock_copy_flags(sk, osk); sock_copy_flags(sk, osk);
@ -808,14 +806,12 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags)
if (!skb->sk) if (!skb->sk)
goto out2; goto out2;
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;
newsock->state = SS_CONNECTED; newsock->state = SS_CONNECTED;
rc = 0; rc = 0;
out2: out2: