[src/netbsd-7]: src/sys/netinet Pull up following revision(s) (requested by s...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9d52f1584118
branches:  netbsd-7
changeset: 800109:9d52f1584118
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jan 05 08:08:46 2017 +0000

description:
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

diffstat:

 sys/netinet/tcp_congctl.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 78a7e6d43127 -r 9d52f1584118 sys/netinet/tcp_congctl.c
--- a/sys/netinet/tcp_congctl.c Tue Jan 03 07:08:05 2017 +0000
+++ b/sys/netinet/tcp_congctl.c Thu Jan 05 08:08:46 2017 +0000
@@ -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 @@
                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 @@
                        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