From owner-svn-src-all@FreeBSD.ORG  Tue Jan  7 23:04:06 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B8E02FA8;
 Tue,  7 Jan 2014 23:04:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A42D4189D;
 Tue,  7 Jan 2014 23:04:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s07N46Bg042561;
 Tue, 7 Jan 2014 23:04:06 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07N46V8042560;
 Tue, 7 Jan 2014 23:04:06 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201401072304.s07N46V8042560@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Tue, 7 Jan 2014 23:04:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-other@freebsd.org
Subject: svn commit: r260423 - stable/4/sys/netinet
X-SVN-Group: stable-other
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jan 2014 23:04:06 -0000

Author: peter
Date: Tue Jan  7 23:04:06 2014
New Revision: 260423
URL: http://svnweb.freebsd.org/changeset/base/260423

Log:
  MFC r258821 - fix tcp simultaneous close
  
  PR:             kern/99188

Modified:
  stable/4/sys/netinet/tcp_input.c

Modified: stable/4/sys/netinet/tcp_input.c
==============================================================================
--- stable/4/sys/netinet/tcp_input.c	Tue Jan  7 23:03:31 2014	(r260422)
+++ stable/4/sys/netinet/tcp_input.c	Tue Jan  7 23:04:06 2014	(r260423)
@@ -1705,13 +1705,15 @@ trimthenstep6:
 	case TCPS_TIME_WAIT:
 
 		if (SEQ_LEQ(th->th_ack, tp->snd_una)) {
-			if (tlen == 0 && tiwin == tp->snd_wnd) {
+			if (tlen == 0 && tiwin == tp->snd_wnd &&
+			    !(thflags & TH_FIN)) {
 				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), the ack is the biggest we've
+				 * change and FIN isn't set),
+				 * 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.