| |
VK7AX > LINHAM 18.06.08 00:26l 68 Lines 2103 Bytes #999 (0) @ WW
BID : VK7AX-1806YY
Read: GUEST
Subj: [PATCH]: Consolidate ax25 socket grafting.
Path: IZ3LSV<IK2XDE<DB0RES<DK0WUE<7M3TJZ<ON0BEL<VK7AX
Sent: 080617/2327Z @:VK7AX.#ULV.TAS.AUS.OC #:47474 [Ulverstone] FBB7.00g $:VK7A
From: VK7AX@VK7AX.#ULV.TAS.AUS.OC
To : LINHAM@WW
From: David Miller <davem(AT)davemloft.net>
Date: Tue, 17 Jun 2008 02:38:19 -0700 (PDT)
To: netdev(AT)vger.kernel.org
CC: ralf(AT)linux-mips.org, linux-hams(AT)vger.kernel.org
This is the netrom variant of the ax25 patch I just posted.
Applied and pushed to net-next-2.6
netrom: Use sock_graft() and remove bogus sk_socket and sk_sleep init.
This is the netrom variant of changeset
9375cb8a1232d2a15fe34bec4d3474872e02faec
("ax25: Use sock_graft() and remove bogus sk_socket and sk_sleep init.")
Signed-off-by: David S. Miller <davem(AT)davemloft.net>
---
net/netrom/af_netrom.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 4bae8b9..5877962 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
(AT)(AT) -475,13 +475,11 (AT)(AT) static struct sock *nr_make_new(struct sock *osk)
sock_init_data(NULL, 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;
sock_copy_flags(sk, osk);
skb_queue_head_init(&nr->ack_queue);
(AT)(AT) -810,13 +808,11 (AT)(AT) static int nr_accept(struct socket *sock, struct socket *newsock, int flags)
goto out_release;
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_acceptq_removed(sk);
- newsock->sk = newsk;
out_release:
release_sock(sk);
-- 1.5.5.1.308.g1fbb5 --
*******************************************************************
ABOVE IS A CROSS POST TO THE PACKET RADIO NETWORK IN AN EFFORT TO
PROMOTE FURTHER INTEREST IN HAM SOFTWARE USING LINUX OPERATING
SYSTEMS AND PACKET RADIO
Courtesy Tony VK7AX VK7AX(AT)VK7AX.#ULV.TAS.AUS.OC
*******************************************************************
Read previous mail | Read next mail
| |
