From d3eede9d32d5b253bd310d7b4518bf3de4ae91f3 Mon Sep 17 00:00:00 2001
From: Andras Olah <olah@FreeBSD.org>
Date: Mon, 31 Jul 1995 10:24:22 +0000
Subject: [PATCH] Remove a redundant `if' from tcp_reass().

Correct a typo in a comment (SEND_SYN -> NEEDSYN).

Reviewed by:	David Greenman
---
 sys/netinet/tcp_input.c | 6 ++----
 sys/netinet/tcp_reass.c | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index eb2f3468f2c0..8e2bdf03e622 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_input.c	8.5 (Berkeley) 4/10/94
- *	$Id: tcp_input.c,v 1.26 1995/06/29 18:11:22 wollman Exp $
+ *	$Id: tcp_input.c,v 1.27 1995/07/10 15:39:13 wollman Exp $
  */
 
 #ifndef TUBA_INCLUDE
@@ -217,8 +217,6 @@ tcp_reass(tp, ti, m)
 	ti = tp->seg_next;
 	if (ti == (struct tcpiphdr *)tp || ti->ti_seq != tp->rcv_nxt)
 		return (0);
-	if (tp->t_state == TCPS_SYN_RECEIVED && ti->ti_len)
-		return (0);
 	do {
 		tp->rcv_nxt += ti->ti_len;
 		flags = ti->ti_flags & TH_FIN;
@@ -1529,7 +1527,7 @@ tcp_input(m, iphlen)
 			socantrcvmore(so);
 			/*
 			 *  If connection is half-synchronized
-			 *  (ie SEND_SYN flag on) then delay ACK,
+			 *  (ie NEEDSYN flag on) then delay ACK,
 			 *  so it may be piggybacked when SYN is sent.
 			 *  Otherwise, since we received a FIN then no
 			 *  more input can be expected, send ACK now.
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index eb2f3468f2c0..8e2bdf03e622 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_input.c	8.5 (Berkeley) 4/10/94
- *	$Id: tcp_input.c,v 1.26 1995/06/29 18:11:22 wollman Exp $
+ *	$Id: tcp_input.c,v 1.27 1995/07/10 15:39:13 wollman Exp $
  */
 
 #ifndef TUBA_INCLUDE
@@ -217,8 +217,6 @@ tcp_reass(tp, ti, m)
 	ti = tp->seg_next;
 	if (ti == (struct tcpiphdr *)tp || ti->ti_seq != tp->rcv_nxt)
 		return (0);
-	if (tp->t_state == TCPS_SYN_RECEIVED && ti->ti_len)
-		return (0);
 	do {
 		tp->rcv_nxt += ti->ti_len;
 		flags = ti->ti_flags & TH_FIN;
@@ -1529,7 +1527,7 @@ tcp_input(m, iphlen)
 			socantrcvmore(so);
 			/*
 			 *  If connection is half-synchronized
-			 *  (ie SEND_SYN flag on) then delay ACK,
+			 *  (ie NEEDSYN flag on) then delay ACK,
 			 *  so it may be piggybacked when SYN is sent.
 			 *  Otherwise, since we received a FIN then no
 			 *  more input can be expected, send ACK now.