diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-17 02:44:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-17 02:44:35 -0700 |
| commit | b61d38e05542200f6d001b5ea9975dc0dc5bab27 (patch) | |
| tree | fdab1cb2b21026433fed1b23adda39de264d8456 /net/x25 | |
| parent | 44ccff1f539c8c5bbfc1eacd41cb9ef65022a4ca (diff) | |
| download | linux-stable-b61d38e05542200f6d001b5ea9975dc0dc5bab27.tar.gz linux-stable-b61d38e05542200f6d001b5ea9975dc0dc5bab27.tar.bz2 linux-stable-b61d38e05542200f6d001b5ea9975dc0dc5bab27.zip | |
x25: Use sock_graft() and remove bogus sk_socket and sk_sleep init.
This is the x25 variant of changeset
9375cb8a1232d2a15fe34bec4d3474872e02faec
("ax25: Use sock_graft() and remove bogus sk_socket and sk_sleep init.")
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25')
| -rw-r--r-- | net/x25/af_x25.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 6ba67c523c16..bcb091f713ec 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -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: |