From 4d15ab4341bc4ade97086d433bfd9f5ace5ddeb1 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 17 Jun 2008 02:20:54 -0700 Subject: [PATCH] --- yaml --- r: 102989 b: refs/heads/master c: 9375cb8a1232d2a15fe34bec4d3474872e02faec h: refs/heads/master i: 102987: 2c06327112477e088879252e66456691cea3f665 v: v3 --- [refs] | 2 +- trunk/net/ax25/af_ax25.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ed1df120b0b0..923c2dd3e598 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee5850defcbd98d3a9cb3e0ae93511e7c89bdecd +refs/heads/master: 9375cb8a1232d2a15fe34bec4d3474872e02faec diff --git a/trunk/net/ax25/af_ax25.c b/trunk/net/ax25/af_ax25.c index 2712544cf0ca..97eaa23ad9ea 100644 --- a/trunk/net/ax25/af_ax25.c +++ b/trunk/net/ax25/af_ax25.c @@ -893,13 +893,11 @@ struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev) sk->sk_destruct = ax25_free_sock; 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); oax25 = ax25_sk(osk); @@ -1361,13 +1359,11 @@ static int ax25_accept(struct socket *sock, struct socket *newsock, int flags) goto out; newsk = skb->sk; - newsk->sk_socket = newsock; - newsk->sk_sleep = &newsock->wait; + sock_graft(newsk, newsock); /* Now attach up the new socket */ kfree_skb(skb); sk->sk_ack_backlog--; - newsock->sk = newsk; newsock->state = SS_CONNECTED; out: