Module Name: src
Committed By: martin
Date: Thu Jan 5 08:08:46 UTC 2017
Modified Files:
src/sys/netinet [netbsd-7]: tcp_congctl.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1347):
sys/netinet/tcp_congctl.c: revision 1.23
Restore behaviour to pre- tcp_congctl.c:1.18 for SACK. Further analysis
of the change is required.
OK kefren@
PR/51753 tcp SACK causes SSH disconnect
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.4.1 src/sys/netinet/tcp_congctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_congctl.c
diff -u src/sys/netinet/tcp_congctl.c:1.19 src/sys/netinet/tcp_congctl.c:1.19.4.1
--- src/sys/netinet/tcp_congctl.c:1.19 Mon Nov 18 11:48:34 2013
+++ src/sys/netinet/tcp_congctl.c Thu Jan 5 08:08:46 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_congctl.c,v 1.19 2013/11/18 11:48:34 kefren Exp $ */
+/* $NetBSD: tcp_congctl.c,v 1.19.4.1 2017/01/05 08:08:46 martin Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001, 2005, 2006 The NetBSD Foundation, Inc.
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.19 2013/11/18 11:48:34 kefren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.19.4.1 2017/01/05 08:08:46 martin Exp $");
#include "opt_inet.h"
#include "opt_tcp_debug.h"
@@ -707,7 +707,6 @@ tcp_newreno_fast_retransmit_newack(struc
tp->t_partialacks++;
TCP_TIMER_DISARM(tp, TCPT_REXMT);
tp->t_rtttime = 0;
- tp->snd_nxt = th->th_ack;
if (TCP_SACK_ENABLED(tp)) {
/*
@@ -734,6 +733,7 @@ tcp_newreno_fast_retransmit_newack(struc
tp->t_flags |= TF_ACKNOW;
(void) tcp_output(tp);
} else {
+ tp->snd_nxt = th->th_ack;
/*
* Set snd_cwnd to one segment beyond ACK'd offset
* snd_una is not yet updated when we're called
