From owner-cvs-src@FreeBSD.ORG Wed Aug 24 18:10:51 2005 Return-Path: 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 8C53E16A41F; Wed, 24 Aug 2005 18:10:51 +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 5E50643D49; Wed, 24 Aug 2005 18:10:51 +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 j7OIApBS063336; Wed, 24 Aug 2005 18:10:51 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7OIApWF063335; Wed, 24 Aug 2005 18:10:51 GMT (envelope-from rwatson) Message-Id: <200508241810.j7OIApWF063335@repoman.freebsd.org> From: Robert Watson Date: Wed, 24 Aug 2005 18:10:51 +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/net if_atmsubr.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Aug 2005 18:10:51 -0000 rwatson 2005-08-24 18:10:51 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/net if_atmsubr.c Log: Merge if_atmsubr.c:1.38 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.2 +9 -6 src/sys/net/if_atmsubr.c