From owner-cvs-src@FreeBSD.ORG  Mon Aug 15 09:54:01 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: 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 71D6E16A41F;
	Mon, 15 Aug 2005 09:54:01 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 31DD743D46;
	Mon, 15 Aug 2005 09:54:01 +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 j7F9s12p039258;
	Mon, 15 Aug 2005 09:54:01 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F9s1e8039257;
	Mon, 15 Aug 2005 09:54:01 GMT (envelope-from rwatson)
Message-Id: <200508150954.j7F9s1e8039257@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 15 Aug 2005 09:54:01 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/netinet if_atm.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
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, 15 Aug 2005 09:54:01 -0000

rwatson     2005-08-15 09:54:01 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/netinet          if_atm.c 
  Log:
  Merge if_atm.c:1.20 from HEAD to RELENG_6:
  
    Add NATM_LOCK() and NATM_UNLOCK() in places where npcb_add() and
    npcb_free() are called, in order to eliminate witness panics.
    This was overlooked in removal of GIANT from ATM.
  
  Approved by:    re (hrs)
  
  Revision  Changes    Path
  1.19.2.1  +9 -0      src/sys/netinet/if_atm.c