Date: Wed, 8 Jan 2014 03:17:32 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org Subject: svn commit: r260438 - stable/6/sys/netinet Message-ID: <201401080317.s083HWP3046576@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401080317.s083HWP3046576>