From owner-cvs-all@FreeBSD.ORG  Thu Jan  6 22:33:59 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1618B16A4CE; Thu,  6 Jan 2005 22:33:59 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id E56D743D48; Thu,  6 Jan 2005 22:33:58 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j06MXwR3055372;
	Thu, 6 Jan 2005 22:33:58 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j06MXw8G055371;
	Thu, 6 Jan 2005 22:33:58 GMT
	(envelope-from rwatson)
Message-Id: <200501062233.j06MXw8G055371@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 6 Jan 2005 22:33:58 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Subject: cvs commit: src/sys/netinet tcp_input.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jan 2005 22:33:59 -0000

rwatson     2005-01-06 22:33:58 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/netinet          tcp_input.c 
  Log:
  Additional merges from tcp_input.c:1.255 in HEAD:
  
    After releasing the tcbinfo lock in preparation for jumping to
    check_delack, set headlocked to 0.  At the check_delack label,
    assert that headlocked is 0.
  
  Revision   Changes    Path
  1.252.2.9  +4 -0      src/sys/netinet/tcp_input.c