svn commit: r260438 - stable/6/sys/netinet
Peter Wemm
peter at FreeBSD.org
Wed Jan 8 03:17:33 UTC 2014
Author: peter
Date: Wed Jan 8 03:17:32 2014
New Revision: 260438
URL: http://svnweb.freebsd.org/changeset/base/260438
Log:
Revert MFC of r258821 - it was already handled by MFC of r239672.
Pointy hat to: peter
Modified:
stable/6/sys/netinet/tcp_input.c
Modified: stable/6/sys/netinet/tcp_input.c
==============================================================================
--- stable/6/sys/netinet/tcp_input.c Wed Jan 8 03:17:11 2014 (r260437)
+++ stable/6/sys/netinet/tcp_input.c Wed Jan 8 03:17:32 2014 (r260438)
@@ -1858,15 +1858,13 @@ trimthenstep6:
(to.to_nsacks > 0 || !TAILQ_EMPTY(&tp->snd_holes)))
tcp_sack_doack(tp, &to, th->th_ack);
if (SEQ_LEQ(th->th_ack, tp->snd_una)) {
- if (tlen == 0 && tiwin == tp->snd_wnd &&
- !(thflags & TH_FIN)) {
+ if (tlen == 0 && tiwin == tp->snd_wnd) {
tcpstat.tcps_rcvdupack++;
/*
* If we have outstanding data (other than
* a window probe), this is a completely
* duplicate ack (ie, window info didn't
- * change and FIN isn't set),
- * the ack is the biggest we've
+ * change), the ack is the biggest we've
* seen and we've seen exactly our rexmt
* threshhold of them, assume a packet
* has been dropped and retransmit it.
More information about the svn-src-stable-6
mailing list