From owner-cvs-src-old@FreeBSD.ORG  Thu Oct  8 11:07:38 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA6241065696
	for <cvs-src-old@freebsd.org>; Thu,  8 Oct 2009 11:07:38 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D8F6B8FC15
	for <cvs-src-old@freebsd.org>; Thu,  8 Oct 2009 11:07:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n98B7csm042813
	for <cvs-src-old@freebsd.org>; Thu, 8 Oct 2009 11:07:38 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n98B7c6w042812
	for cvs-src-old@freebsd.org; Thu, 8 Oct 2009 11:07:38 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Message-Id: <200910081107.n98B7c6w042812@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	rwatson@repoman.freebsd.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 8 Oct 2009 11:07:15 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
Subject: cvs commit: src/sys/netinet tcp_input.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Oct 2009 11:07:39 -0000

rwatson     2009-10-08 11:07:15 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    sys/netinet          tcp_input.c 
  Log:
  SVN rev 197854 on 2009-10-08 11:07:15Z by rwatson
  
  Merge r197795 from head to stable/8:
  
    In tcp_input(), we acquire a global write lock at first only if a
    segment is likely to trigger a TCP state change (i.e., FIN/RST/SYN).
    If we later have to upgrade the lock, we acquire an inpcb reference
    and drop both global/inpcb locks before reacquiring in-order.  In
    that gap, the connection may transition into TIMEWAIT, so we need
    to loop back and reevaluate the inpcb after relocking.
  
    Reported by:        Kamigishi Rei <spambox at haruhiism.net>
    Reviewed by:        bz
  
  Approved by:    re (kib)
  
  Revision   Changes    Path
  1.411.2.2  +4 -1      src/sys/netinet/tcp_input.c