From owner-cvs-src@FreeBSD.ORG  Wed Dec 22 09:34:49 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 95A2E16A4CF; Wed, 22 Dec 2004 09:34:49 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 6CC9443D55; Wed, 22 Dec 2004 09:34:49 +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 iBM9YnXw031848;
	Wed, 22 Dec 2004 09:34:49 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBM9Ynhq031847;
	Wed, 22 Dec 2004 09:34:49 GMT
	(envelope-from rwatson)
Message-Id: <200412220934.iBM9Ynhq031847@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 22 Dec 2004 09:34:49 +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:34:49 -0000

rwatson     2004-12-22 09:34:49 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/netinet          ip_output.c 
  Log:
  Merge ip_output.c:1.236 from HEAD to RELENG_5:
  
    date: 2004/12/05 22:08:37;  author: rwatson;  state: Exp;  lines: +14 -6
    Pass the inpcb reference into ip_getmoptions() rather than just the
    inp->inp_moptions pointer, so that ip_getmoptions() can perform
    necessary locking when doing non-atomic reads.
  
    Lock the inpcb by default to copy any data to local variables, then
    unlock before performing sooptcopyout().
  
    MFC after:      2 weeks
  
  Revision   Changes    Path
  1.225.2.7  +14 -6     src/sys/netinet/ip_output.c