diff options
author | olah <olah@FreeBSD.org> | 1995-07-31 10:24:22 +0000 |
---|---|---|
committer | olah <olah@FreeBSD.org> | 1995-07-31 10:24:22 +0000 |
commit | fd35d46e41e41817874f8f31871fecd2e24627af (patch) | |
tree | 9a447af72f9f8c7bd7b30aaa0d1ea451cb534641 /sys | |
parent | 51c2dd9b11cdf65018cc3049867cdcb385485d65 (diff) | |
download | FreeBSD-src-fd35d46e41e41817874f8f31871fecd2e24627af.zip FreeBSD-src-fd35d46e41e41817874f8f31871fecd2e24627af.tar.gz |
Remove a redundant `if' from tcp_reass().
Correct a typo in a comment (SEND_SYN -> NEEDSYN).
Reviewed by: David Greenman
Diffstat (limited to 'sys')
-rw-r--r-- | sys/netinet/tcp_input.c | 6 | ||||
-rw-r--r-- | 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 eb2f346..8e2bdf0 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 @@ present: 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 @@ dodata: /* XXX */ 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 eb2f346..8e2bdf0 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 @@ present: 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 @@ dodata: /* XXX */ 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. |