From owner-cvs-all@FreeBSD.ORG  Sat Dec 25 22:46:37 2004
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 62EB116A4CE; Sat, 25 Dec 2004 22:46:37 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 5098B43D2F; Sat, 25 Dec 2004 22:46:37 +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 iBPMkb6J071466;
	Sat, 25 Dec 2004 22:46:37 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBPMkbbw071465;
	Sat, 25 Dec 2004 22:46:37 GMT
	(envelope-from rwatson)
Message-Id: <200412252246.iBPMkbbw071465@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 25 Dec 2004 22:46:37 +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: Sat, 25 Dec 2004 22:46:37 -0000

rwatson     2004-12-25 22:46:37 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/netinet          tcp_input.c 
  Log:
  Merge tcp_input.c:1.258 from HEAD to RELENG_5, with the exception of
  one block obsoleted by the decision not to hold the TCP pcbinfo lock
  over a jump to check_delack:
  
    date: 2004/11/23 23:41:20;  author: rwatson;  state: Exp;  lines: +19 -12
    In tcp_reass(), assert the inpcb lock on the passed tcpcb, since the
    contents of the tcpcb are read and modified in volume.
  
    In tcp_input(), replace th comparison with 0 with a comparison with
    NULL.
  
    At the 'findpcb', 'dropafterack', and 'dropwithreset' labels in
    tcp_input(), assert 'headlocked'.  Try to improve consistency between
    various assertions regarding headlocked to be more informative.
  
    MFC after:      2 weeks
  
  Revision   Changes    Path
  1.252.2.7  +18 -11    src/sys/netinet/tcp_input.c