| |
VK7AX > LINHAM 18.06.08 01:26l 72 Lines 2240 Bytes #999 (0) @ WW
BID : VK7AX-1806NN
Read: GUEST
Subj: [PATCH]: Consolidate x25 socket grafting.
Path: IZ3LSV<IK2XDE<DB0RES<DK0WUE<7M3TJZ<ON0BEL<VK7AX
Sent: 080617/2327Z @:VK7AX.#ULV.TAS.AUS.OC #:47477 [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:46:27 -0700 (PDT)
To: eis(AT)baty.hanse.de
CC: linux-x25(AT)vger.kernel.org, netdev(AT)vger.kernel.org,
ralf(AT)linux-mips.org, linux-hams(AT)vger.kernel.org
This is the x25 variant of the previous 3 radio protocol
patches I just posted to netdev and linux-hams.
Applied and pushed out to net-next-2.6
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(AT)davemloft.net>
---
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 6ba67c5..bcb091f 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
(AT)(AT) -555,13 +555,11 (AT)(AT) 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);
(AT)(AT) -808,14 +806,12 (AT)(AT) 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:
-- 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
| |
