From owner-cvs-src@FreeBSD.ORG  Mon Aug 15 09:51:16 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 B3B6416A41F;
	Mon, 15 Aug 2005 09:51:16 +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 82ACB43D46;
	Mon, 15 Aug 2005 09:51:16 +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 j7F9pGiG039143;
	Mon, 15 Aug 2005 09:51:16 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F9pGjp039142;
	Mon, 15 Aug 2005 09:51:16 GMT (envelope-from rwatson)
Message-Id: <200508150951.j7F9pGjp039142@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 15 Aug 2005 09:51:15 +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/netnatm natm.c natm.h natm_pcb.c natm_proto.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:51:16 -0000

rwatson     2005-08-15 09:51:15 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/netnatm          natm.c natm.h natm_pcb.c natm_proto.c 
  Log:
  Merge if_atmsubr.c:1.38, natm.c:1.38, natm.h:1.11, natm_pcb.c:1.16,
  natm_proto.c:1.16 from HEAD to RELENG_6:
  
    Lock down netnatm and mark as MPSAFE:
  
    - Introduce a subsystem mutex, natm_mtx, manipulated with accessor macros
      NATM_LOCK_INIT(), NATM_LOCK(), NATM_UNLOCK(), NATM_LOCK_ASSERT().  It
      protects the consistency of pcb-related data structures.  Finer grained
      locking is possible, but should be done in the context of specific
      measurements (as very little work is done in netnatm -- most is in the
      ATM device driver or socket layer, so there's probably not much
      contention).
  
    - Remove GIANT_REQUIRED, mark as NETISR_MPSAFE, remove
      NET_NEEDS_GIANT("netnatm").
  
    - Conditionally acquire Giant when entering network interfaces for
      ifp->if_ioctl() using IFF_LOCKGIANT(ifp)/IFF_UNLOCKGIANT(ifp) in order
      to coexist with non-MPSAFE atm ifnet drivers..
  
    - De-spl.
  
    Reviewed by:    harti, bms (various versions)
  
  Approved by:    re (hrs)
  
  Revision  Changes    Path
  1.37.2.1  +56 -51    src/sys/netnatm/natm.c
  1.10.2.1  +7 -0      src/sys/netnatm/natm.h
  1.15.2.1  +3 -5      src/sys/netnatm/natm_pcb.c
  1.15.2.1  +2 -3      src/sys/netnatm/natm_proto.c