From owner-cvs-all@FreeBSD.ORG  Thu Jun 24 02:57:22 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 6D10016A4CE; Thu, 24 Jun 2004 02:57:22 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4EF7743D54; Thu, 24 Jun 2004 02:57:22 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5O2vC7c029515;
	Thu, 24 Jun 2004 02:57:12 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5O2vCdX029514;
	Thu, 24 Jun 2004 02:57:12 GMT
	(envelope-from rwatson)
Message-Id: <200406240257.i5O2vCdX029514@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 24 Jun 2004 02:57:12 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/netinet tcp_input.c src/sys/sys socketvar.h
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, 24 Jun 2004 02:57:22 -0000

rwatson     2004-06-24 02:57:12 UTC

  FreeBSD src repository

  Modified files:
    sys/netinet          tcp_input.c 
    sys/sys              socketvar.h 
  Log:
  Protect so_oobmark with with SOCKBUF_LOCK(&so->so_rcv), and broaden
  locking in tcp_input() for TCP packets with urgent data pointers to
  hold the socket buffer lock across testing and updating oobmark
  from just protecting sb_state.
  
  Update socket locking annotations
  
  Revision  Changes    Path
  1.245     +3 -4      src/sys/netinet/tcp_input.c
  1.128     +1 -1      src/sys/sys/socketvar.h