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

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

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



This is the x25 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 44ccff1f

net/x25/af_x25.c

+1 −5
Original line number Diff line number Diff line
@@ -555,13 +555,11 @@ static struct sock *x25_make_new(struct sock *osk) 
	x25 = x25_sk(sk);



	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;

	sk->sk_backlog_rcv = osk->sk_backlog_rcv;

	sock_copy_flags(sk, osk);
@@ -808,14 +806,12 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags) 
	if (!skb->sk)

		goto out2;

	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;

	newsock->state = SS_CONNECTED;

	rc = 0;

out2: