From owner-svn-src-stable@freebsd.org  Fri Sep 30 18:14:06 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3923DC03D81;
 Fri, 30 Sep 2016 18:14:06 +0000 (UTC)
 (envelope-from hiren@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 08D8A19E7;
 Fri, 30 Sep 2016 18:14:05 +0000 (UTC)
 (envelope-from hiren@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8UIE5t3070800;
 Fri, 30 Sep 2016 18:14:05 GMT (envelope-from hiren@FreeBSD.org)
Received: (from hiren@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8UIE5te070799;
 Fri, 30 Sep 2016 18:14:05 GMT (envelope-from hiren@FreeBSD.org)
Message-Id: <201609301814.u8UIE5te070799@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hiren set sender to
 hiren@FreeBSD.org using -f
From: Hiren Panchasara <hiren@FreeBSD.org>
Date: Fri, 30 Sep 2016 18:14:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r306517 - stable/11/sys/netinet
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Sep 2016 18:14:06 -0000

Author: hiren
Date: Fri Sep 30 18:14:05 2016
New Revision: 306517
URL: https://svnweb.freebsd.org/changeset/base/306517

Log:
  MFC r304855
  
  Update TCPS_HAVERCVDFIN() macro to correctly include all states a connection
  can be in after receiving a FIN.
  
  FWIW, NetBSD has this change for quite some time.
  
  This has been tested at Netflix and Limelight in production traffic.

Modified:
  stable/11/sys/netinet/tcp_fsm.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/tcp_fsm.h
==============================================================================
--- stable/11/sys/netinet/tcp_fsm.h	Fri Sep 30 18:12:16 2016	(r306516)
+++ stable/11/sys/netinet/tcp_fsm.h	Fri Sep 30 18:14:05 2016	(r306517)
@@ -73,7 +73,8 @@
 
 #define	TCPS_HAVERCVDSYN(s)	((s) >= TCPS_SYN_RECEIVED)
 #define	TCPS_HAVEESTABLISHED(s)	((s) >= TCPS_ESTABLISHED)
-#define	TCPS_HAVERCVDFIN(s)	((s) >= TCPS_TIME_WAIT)
+#define	TCPS_HAVERCVDFIN(s)	\
+    ((s) == TCPS_CLOSE_WAIT || ((s) >= TCPS_CLOSING && (s) != TCPS_FIN_WAIT_2))
 
 #ifdef	TCPOUTFLAGS
 /*