From owner-cvs-src@FreeBSD.ORG  Wed Dec 22 09:31:07 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id B2B7B16A4CE; Wed, 22 Dec 2004 09:31:07 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 9EBFC43D2F; Wed, 22 Dec 2004 09:31:07 +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 iBM9V7ld031706;
	Wed, 22 Dec 2004 09:31:07 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBM9V7ax031705;
	Wed, 22 Dec 2004 09:31:07 GMT
	(envelope-from rwatson)
Message-Id: <200412220931.iBM9V7ax031705@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 22 Dec 2004 09:31:07 +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 ip_output.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Dec 2004 09:31:07 -0000

rwatson     2004-12-22 09:31:07 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/netinet          ip_output.c 
  Log:
  Merge ip_output.c:1.233 (and forced commit MFC reminder
  ip_output.c:1.234) from HEAD to RELENG_5:
  
    date: 2004/12/05 19:11:09;  author: rwatson;  state: Exp;  lines: +13 -10
    Start working through inpcb locking for ip_ctloutput() by cleaning up
    modifications to the inpcb IP options mbuf:
  
    - Lock the inpcb before passing it into ip_pcbopts() in order to prevent
      simulatenous reads and read-modify-writes that could result in races.
    - Pass the inpcb reference into ip_pcbopts() instead of the option chain
      pointer in the inpcb.
    - Assert the inpcb lock in ip_pcbots.
    - Convert one or two uses of a pointer as a boolean or an integer
      comparison to a comparison with NULL for readability.
  
  Revision   Changes    Path
  1.225.2.6  +13 -10    src/sys/netinet/ip_output.c