Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/netinet Restore behaviour to pre- tcp_congctl.c:1.18 for...
details: https://anonhg.NetBSD.org/src/rev/dba76cf6d2fb
branches: trunk
changeset: 820162:dba76cf6d2fb
user: skrll <skrll%NetBSD.org@localhost>
date: Mon Jan 02 09:29:38 2017 +0000
description:
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 a231291a9f6b -r dba76cf6d2fb sys/netinet/tcp_congctl.c
--- a/sys/netinet/tcp_congctl.c Mon Jan 02 09:24:54 2017 +0000
+++ b/sys/netinet/tcp_congctl.c Mon Jan 02 09:29:38 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_congctl.c,v 1.22 2016/12/13 08:29:03 ozaki-r Exp $ */
+/* $NetBSD: tcp_congctl.c,v 1.23 2017/01/02 09:29:38 skrll 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.22 2016/12/13 08:29:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_congctl.c,v 1.23 2017/01/02 09:29:38 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.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
Home |
Main Index |
Thread Index |
Old Index