From owner-p4-projects@FreeBSD.ORG  Thu Aug 16 23:21:37 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C738016A46B; Thu, 16 Aug 2007 23:21:36 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7BFA316A421
	for <perforce@FreeBSD.org>; Thu, 16 Aug 2007 23:21:36 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5268B13C481
	for <perforce@FreeBSD.org>; Thu, 16 Aug 2007 23:21:36 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7GNLapd038132
	for <perforce@FreeBSD.org>; Thu, 16 Aug 2007 23:21:36 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7GNLZhx038119
	for perforce@freebsd.org; Thu, 16 Aug 2007 23:21:35 GMT
	(envelope-from zec@FreeBSD.org)
Date: Thu, 16 Aug 2007 23:21:35 GMT
Message-Id: <200708162321.l7GNLZhx038119@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 125243 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 16 Aug 2007 23:21:37 -0000

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

Change 125243 by zec@zec_tpx32 on 2007/08/16 23:20:36

	Unbreak ipfw (well, at least it can be kldloaded now)
	by taking care not to initialize a lock multiple times.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#23 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#23 (text+ko) ====

@@ -4974,7 +4974,6 @@
 	    sizeof(ipfw_dyn_rule), NULL, NULL, NULL, NULL,
 	    UMA_ALIGN_PTR, 0);
 #endif
-	IPFW_DYN_LOCK_INIT();
 	callout_init(&V_ipfw_timeout, CALLOUT_MPSAFE);
 
 	bzero(&default_rule, sizeof default_rule);