patch-2.3.99-pre6 linux/net/ipv4/tcp_input.c

• Lines: 65
• Date: Mon Apr 24 13:59:57 2000
• Orig file: v2.3.99-pre5/linux/net/ipv4/tcp_input.c
• Orig date: Tue Apr 11 15:09:26 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/net/ipv4/tcp_input.c linux/net/ipv4/tcp_input.c
@@ -5,7 +5,7 @@
  *
  *		Implementation of the Transmission Control Protocol(TCP).
  *
- * Version:	$Id: tcp_input.c,v 1.191 2000/03/25 01:55:13 davem Exp $
+ * Version:	$Id: tcp_input.c,v 1.193 2000/04/20 14:41:16 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -1618,6 +1618,7 @@
 
 	tp->fin_seq = TCP_SKB_CB(skb)->end_seq;
 	tp->ack.pending = 1;
+	tp->ack.quick = 0;
 
 	sk->shutdown |= RCV_SHUTDOWN;
 
@@ -1670,9 +1671,9 @@
 
 		/* Do not send POLL_HUP for half duplex close. */
 		if (sk->shutdown == SHUTDOWN_MASK || sk->state == TCP_CLOSE)
-			sock_wake_async(sk->socket, 1, POLL_HUP);
+			sk_wake_async(sk, 1, POLL_HUP);
 		else
-			sock_wake_async(sk->socket, 1, POLL_IN);
+			sk_wake_async(sk, 1, POLL_IN);
 	}
 }
 
@@ -2207,7 +2208,7 @@
 			kill_proc(sk->proc, SIGURG, 1);
 		else
 			kill_pg(-sk->proc, SIGURG, 1);
-		sock_wake_async(sk->socket, 3, POLL_PRI);
+		sk_wake_async(sk, 3, POLL_PRI);
 	}
 
 	/* We may be adding urgent data when the last byte read was
@@ -2783,7 +2784,7 @@
 		newtp->fin_seq = req->rcv_isn;
 		newtp->urg_data = 0;
 		newtp->listen_opt = NULL;
-		newtp->accept_queue = NULL;
+		newtp->accept_queue = newtp->accept_queue_tail = NULL;
 		/* Deinitialize syn_wait_lock to trap illegal accesses. */
 		memset(&newtp->syn_wait_lock, 0, sizeof(newtp->syn_wait_lock));
 
@@ -3162,7 +3163,7 @@
 
 		if(!sk->dead) {
 			sk->state_change(sk);
-			sock_wake_async(sk->socket, 0, POLL_OUT);
+			sk_wake_async(sk, 0, POLL_OUT);
 		}
 
 		if (tp->write_pending) {
@@ -3444,7 +3445,7 @@
 				 */
 				if (!sk->dead) {
 					sk->state_change(sk);
-					sock_wake_async(sk->socket,0,POLL_OUT);
+					sk_wake_async(sk,0,POLL_OUT);
 				}
 
 				tp->snd_una = TCP_SKB_CB(skb)->ack_seq;