patch-2.1.93 linux/net/ipv4/tcp_input.c

• Lines: 39
• Date: Fri Apr 3 17:48:11 1998
• Orig file: v2.1.92/linux/net/ipv4/tcp_input.c
• Orig date: Wed Apr 1 20:11:55 1998

diff -u --recursive --new-file v2.1.92/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.103 1998/03/30 08:41:12 davem Exp $
+ * Version:	$Id: tcp_input.c,v 1.104 1998/04/01 07:41:24 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -1906,7 +1906,10 @@
 			tp->rcv_nxt = TCP_SKB_CB(skb)->seq+1;
 			tp->rcv_wup = TCP_SKB_CB(skb)->seq+1;
 
-			tp->snd_wnd = htons(th->window) << tp->snd_wscale;
+			/* RFC1323: The window in SYN & SYN/ACK segments is
+			 * never scaled.
+			 */
+			tp->snd_wnd = htons(th->window);
 			tp->snd_wl1 = TCP_SKB_CB(skb)->seq;
 			tp->snd_wl2 = TCP_SKB_CB(skb)->ack_seq;
 			tp->fin_seq = TCP_SKB_CB(skb)->seq;
@@ -1918,6 +1921,7 @@
                 		tp->snd_wscale = tp->rcv_wscale = 0;
                 		tp->window_clamp = min(tp->window_clamp,65535);
         		}
+
 			if (tp->tstamp_ok) {
 				tp->tcp_header_len =
 					sizeof(struct tcphdr) + TCPOLEN_TSTAMP_ALIGNED;
@@ -1980,6 +1984,9 @@
 				tp->rcv_nxt = TCP_SKB_CB(skb)->seq + 1;
 				tp->rcv_wup = TCP_SKB_CB(skb)->seq + 1;
 
+				/* RFC1323: The window in SYN & SYN/ACK segments is
+				 * never scaled.
+				 */
 				tp->snd_wnd = htons(th->window);
 				tp->snd_wl1 = TCP_SKB_CB(skb)->seq;