From owner-cvs-src-old@FreeBSD.ORG  Tue Jun  1 14:19:02 2010
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 1F45F1065675
	for <cvs-src-old@freebsd.org>; Tue,  1 Jun 2010 14:19:02 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E8C588FC1B
	for <cvs-src-old@freebsd.org>; Tue,  1 Jun 2010 14:19:01 +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 o51EJ1gT084657
	for <cvs-src-old@freebsd.org>; Tue, 1 Jun 2010 14:19:01 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o51EJ1Wq084656
	for cvs-src-old@freebsd.org; Tue, 1 Jun 2010 14:19:01 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Message-Id: <201006011419.o51EJ1Wq084656@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: Tue, 1 Jun 2010 14:18:44 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
Subject: cvs commit: src/sys/netinet in_pcb.h 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: Tue, 01 Jun 2010 14:19:02 -0000

rwatson     2010-06-01 14:18:44 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    sys/netinet          in_pcb.h tcp_input.c 
  Log:
  SVN rev 208698 on 2010-06-01 14:18:44Z by rwatson
  
  Merge r204806 from head to stable/8:
  
    Wrap use of rw_try_upgrade() on pcbinfo with macro INP_INFO_TRY_UPGRADE()
    to match other pcbinfo locking macros.
  
  Approved by:    re (bz)
  
  Revision   Changes    Path
  1.142.2.2  +1 -0      src/sys/netinet/in_pcb.h
  1.411.2.6  +2 -2      src/sys/netinet/tcp_input.c