From owner-svn-src-head@FreeBSD.ORG  Sat Sep 21 04:11:52 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 86AD37BE;
 Sat, 21 Sep 2013 04:11:52 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 73CE32559;
 Sat, 21 Sep 2013 04:11:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8L4BqMZ029705;
 Sat, 21 Sep 2013 04:11:52 GMT (envelope-from cy@svn.freebsd.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8L4BqhI029704;
 Sat, 21 Sep 2013 04:11:52 GMT (envelope-from cy@svn.freebsd.org)
Message-Id: <201309210411.r8L4BqhI029704@svn.freebsd.org>
From: Cy Schubert <cy@FreeBSD.org>
Date: Sat, 21 Sep 2013 04:11:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255757 - head/sys/contrib/ipfilter/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Sep 2013 04:11:52 -0000

Author: cy
Date: Sat Sep 21 04:11:51 2013
New Revision: 255757
URL: http://svnweb.freebsd.org/changeset/base/255757

Log:
  Address double init of ip_log mutex, fixing a panic after ipfilter is
  re-enabled following it being disabled.
  
  Approved by:	glebius (mentor)
  Approved by:	re (blanket)

Modified:
  head/sys/contrib/ipfilter/netinet/ip_log.c

Modified: head/sys/contrib/ipfilter/netinet/ip_log.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_log.c	Sat Sep 21 04:08:52 2013	(r255756)
+++ head/sys/contrib/ipfilter/netinet/ip_log.c	Sat Sep 21 04:11:51 2013	(r255757)
@@ -324,7 +324,7 @@ ipf_log_soft_fini(softc, arg)
 # endif
 			MUTEX_ENTER(&softl->ipl_mutex[i]);
 		}
-		MUTEX_EXIT(&softl->ipl_mutex[i]);
+		MUTEX_DESTROY(&softl->ipl_mutex[i]);
 	}
 
 	return 0;