From owner-p4-projects@FreeBSD.ORG  Fri Aug 22 09:27:06 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8FE6616A4C1; Fri, 22 Aug 2003 09:27:05 -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 3023516A4BF
	for <perforce@freebsd.org>; Fri, 22 Aug 2003 09:27:05 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CB30D43FEA
	for <perforce@freebsd.org>; Fri, 22 Aug 2003 09:27:04 -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 h7MGR40U023709
	for <perforce@freebsd.org>; Fri, 22 Aug 2003 09:27:04 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7MGR4mH023706
	for perforce@freebsd.org; Fri, 22 Aug 2003 09:27:04 -0700 (PDT)
Date: Fri, 22 Aug 2003 09:27:04 -0700 (PDT)
Message-Id: <200308221627.h7MGR4mH023706@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 36675 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: Fri, 22 Aug 2003 16:27:06 -0000

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

Change 36675 by sam@sam_ebb on 2003/08/22 09:26:20

	o use lower case for mutex name
	o destroy mutex on module unload
	o move unload logic to separate function

Affected files ...

.. //depot/projects/netperf/sys/net/bridge.c#4 edit

Differences ...

==== //depot/projects/netperf/sys/net/bridge.c#4 (text+ko) ====

@@ -1158,7 +1158,7 @@
     if (ifp2sc == NULL)
 	return ENOMEM;
 
-    mtx_init(&bdg_mtx, "Bridge", NULL, MTX_DEF);
+    mtx_init(&bdg_mtx, "bridge", NULL, MTX_DEF);
 
     n_clusters = 0;
     clusters = NULL;
@@ -1177,6 +1177,27 @@
     return 0 ;
 }
 
+#ifdef KLD_MODULE
+static void
+bdgdestroy(void)
+{
+    bridge_in_ptr = NULL;
+    bdg_forward_ptr = NULL;
+    bdgtakeifaces_ptr = NULL;
+
+    callout_stop(&bdg_callout);
+    bridge_off();
+
+    if (clusters)
+	free(clusters, M_IFADDR);
+    if (ifp2sc) {
+	free(ifp2sc, M_IFADDR);
+	ifp2sc = NULL;
+    }
+    mtx_destroy(&bdg_mtx);
+}
+#endif /* KLD_MODULE */
+
 /*
  * initialization code, both for static and dynamic loading.
  */
@@ -1200,15 +1221,7 @@
 #else
 		/* XXX lock */
 		do_bridge = 0;
-		bridge_in_ptr = NULL;
-		bdg_forward_ptr = NULL;
-		bdgtakeifaces_ptr = NULL;
-		callout_stop(&bdg_callout);
-		bridge_off();
-		if (clusters)
-		    free(clusters, M_IFADDR);
-		free(ifp2sc, M_IFADDR);
-		ifp2sc = NULL ;
+		bdgdestroy();
 #endif
 		break;
 	default: