From owner-p4-projects@FreeBSD.ORG  Tue Sep  2 14:46:38 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AD94716A4C2; Tue,  2 Sep 2003 14:46:38 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6AD0216A4BF
	for <perforce@freebsd.org>; Tue,  2 Sep 2003 14:46:38 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ED17043FF3
	for <perforce@freebsd.org>; Tue,  2 Sep 2003 14:46:37 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h82Lkb0U010448
	for <perforce@freebsd.org>; Tue, 2 Sep 2003 14:46:37 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h82LkbrE010445
	for perforce@freebsd.org; Tue, 2 Sep 2003 14:46:37 -0700 (PDT)
Date: Tue, 2 Sep 2003 14:46:37 -0700 (PDT)
Message-Id: <200309022146.h82LkbrE010445@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 37401 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Sep 2003 21:46:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=37401

Change 37401 by sam@sam_ebb on 2003/09/02 14:46:12

	IFC

Affected files ...

.. //depot/projects/netperf/sys/kern/uipc_domain.c#3 integrate

Differences ...

==== //depot/projects/netperf/sys/kern/uipc_domain.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.32 2003/06/11 00:56:58 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.34 2003/09/02 20:59:23 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
@@ -71,6 +71,7 @@
 
 struct domain *domains;		/* registered protocol domains */
 struct mtx dom_mtx;		/* domain list lock */
+MTX_SYSINIT(domain, &dom_mtx, "domain list", MTX_DEF);
 
 /*
  * Add a new protocol domain to the list of supported domains
@@ -80,7 +81,7 @@
 static void
 net_init_domain(struct domain *dp)
 {
-	register struct protosw *pr;
+	struct protosw *pr;
 
 	if (dp->dom_init)
 		(*dp->dom_init)();
@@ -110,10 +111,10 @@
 	struct domain *dp;
 
 	dp = (struct domain *)data;
-	DOMAIN_LOCK();
+	mtx_lock(&dom_mtx);
 	dp->dom_next = domains;
 	domains = dp;
-	DOMAIN_UNLOCK();
+	mtx_unlock(&dom_mtx);
 	net_init_domain(dp);
 }