summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordg <dg@FreeBSD.org>1995-04-10 17:16:10 +0000
committerdg <dg@FreeBSD.org>1995-04-10 17:16:10 +0000
commit95eb1b83650fc48928b4873ad31cc262e5fa081c (patch)
tree3f2278a8d3ab0cd940a7d6ada522735252e1ee98
parent07338094b016a9613fcbb54c5c882dc35abf3fb1 (diff)
downloadFreeBSD-src-95eb1b83650fc48928b4873ad31cc262e5fa081c.zip
FreeBSD-src-95eb1b83650fc48928b4873ad31cc262e5fa081c.tar.gz
Fixed bug I introduced with my Nagel hack which caused tcp_input and
tcp_output to loop endlessly. This was freefall's problem during the past day.
-rw-r--r--sys/netinet/tcp_input.c6
-rw-r--r--sys/netinet/tcp_reass.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 0ec0643..71ef017 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.18 1995/04/05 10:32:14 olah Exp $
+ * $Id: tcp_input.c,v 1.19 1995/04/09 01:29:24 davidg Exp $
*/
#ifndef TUBA_INCLUDE
@@ -522,7 +522,7 @@ findpcb:
* congestion avoidance sender won't send more until
* he gets an ACK.
*/
- if (ti->ti_flags & TH_PUSH) {
+ if (tiflags & TH_PUSH) {
tp->t_flags |= TF_ACKNOW;
tcp_output(tp);
} else {
@@ -1561,7 +1561,7 @@ dodata: /* XXX */
* congestion avoidance sender won't send more until
* he gets an ACK.
*/
- if (ti->ti_flags & TH_PUSH)
+ if (tiflags & TH_PUSH)
tp->t_flags |= TF_ACKNOW;
/*
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 0ec0643..71ef017 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.18 1995/04/05 10:32:14 olah Exp $
+ * $Id: tcp_input.c,v 1.19 1995/04/09 01:29:24 davidg Exp $
*/
#ifndef TUBA_INCLUDE
@@ -522,7 +522,7 @@ findpcb:
* congestion avoidance sender won't send more until
* he gets an ACK.
*/
- if (ti->ti_flags & TH_PUSH) {
+ if (tiflags & TH_PUSH) {
tp->t_flags |= TF_ACKNOW;
tcp_output(tp);
} else {
@@ -1561,7 +1561,7 @@ dodata: /* XXX */
* congestion avoidance sender won't send more until
* he gets an ACK.
*/
- if (ti->ti_flags & TH_PUSH)
+ if (tiflags & TH_PUSH)
tp->t_flags |= TF_ACKNOW;
/*
OpenPOWER on IntegriCloud