patch-2.2.12 linux/net/ipv4/tcp_ipv4.c

• Lines: 51
• Date: Wed Aug 25 17:29:53 1999
• Orig file: v2.2.11/linux/net/ipv4/tcp_ipv4.c
• Orig date: Mon Aug 9 16:05:58 1999

diff -u --recursive --new-file v2.2.11/linux/net/ipv4/tcp_ipv4.c linux/net/ipv4/tcp_ipv4.c
@@ -5,7 +5,7 @@
  *
  *		Implementation of the Transmission Control Protocol(TCP).
  *
- * Version:	$Id: tcp_ipv4.c,v 1.175.2.8 1999/08/08 08:43:20 davem Exp $
+ * Version:	$Id: tcp_ipv4.c,v 1.175.2.10 1999/08/13 16:14:35 davem Exp $
  *
  *		IPv4 specific functions
  *
@@ -1026,7 +1026,7 @@
  *
  *  Assumes that the caller did basic address and flag checks.
  */
-static void tcp_v4_send_ack(struct sk_buff *skb, __u32 seq, __u32 ack)
+static void tcp_v4_send_ack(struct sk_buff *skb, __u32 seq, __u32 ack, __u16 window)
 {
 	struct tcphdr *th = skb->h.th;
 	struct tcphdr rth;
@@ -1042,6 +1042,8 @@
 	rth.ack_seq = ack; 
 	rth.ack = 1;
 
+	rth.window = htons(window);
+
 	memset(&arg, 0, sizeof arg); 
 	arg.iov[0].iov_base = (unsigned char *)&rth; 
 	arg.iov[0].iov_len  = sizeof rth;
@@ -1774,17 +1776,18 @@
 do_time_wait:
 	/* Sorry for the ugly switch. 2.3 will have a better solution. */ 
 	switch (tcp_timewait_state_process((struct tcp_tw_bucket *)sk,
-							   skb, th, skb->len)) {
+					   skb, th, skb->len)) {
 	case TCP_TW_ACK:
-		tcp_v4_send_ack(skb, ((struct tcp_tw_bucket *)sk)->snd_nxt,
-						((struct tcp_tw_bucket *)sk)->rcv_nxt); 
-		break; 
+		tcp_v4_send_ack(skb,
+				((struct tcp_tw_bucket *)sk)->snd_nxt,
+				((struct tcp_tw_bucket *)sk)->rcv_nxt,
+				((struct tcp_tw_bucket *)sk)->window);
+		goto discard_it; 
 	case TCP_TW_RST:
 		goto no_tcp_socket; 
 	default:
 		goto discard_it; 
 	}
-	return 0;
 }
 
 static void __tcp_v4_rehash(struct sock *sk)