From owner-cvs-src@FreeBSD.ORG  Mon Mar  1 14:37:04 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 86B6316A555; Mon,  1 Mar 2004 14:37:02 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 807EA43D45; Mon,  1 Mar 2004 14:37:02 -0800 (PST)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i21Mb2Ge091557;
	Mon, 1 Mar 2004 14:37:02 -0800 (PST)
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i21Mb2es091556;
	Mon, 1 Mar 2004 14:37:02 -0800 (PST)
	(envelope-from rwatson)
Message-Id: <200403012237.i21Mb2es091556@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 1 Mar 2004 14:37:02 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/sys mutex.h src/sys/netinet ip_input.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: Mon, 01 Mar 2004 22:37:04 -0000

rwatson     2004/03/01 14:37:02 PST

  FreeBSD src repository

  Modified files:
    sys/sys              mutex.h 
    sys/netinet          ip_input.c 
  Log:
  Rename NET_PICKUP_GIANT() to NET_LOCK_GIANT(), and NET_DROP_GIANT()
  to NET_UNLOCK_GIANT().  While they are used in similar ways, the
  semantics are quite different -- NET_LOCK_GIANT() and NET_UNLOCK_GIANT()
  directly wrap mutex lock and unlock operations, whereas drop/pickup
  special case the handling of Giant recursion.  Add a comment saying
  as much.
  
  Add NET_ASSERT_GIANT(), which conditionally asserts Giant based
  on the value of debug_mpsafenet.
  
  Revision  Changes    Path
  1.266     +2 -2      src/sys/netinet/ip_input.c
  1.69      +10 -4     src/sys/sys/mutex.h