From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 21 09:12:34 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id F16A0106564A;
	Thu, 21 Jun 2012 09:12:33 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DD01A8FC1B;
	Thu, 21 Jun 2012 09:12:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5L9CXwc001298;
	Thu, 21 Jun 2012 09:12:33 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5L9CXpt001296;
	Thu, 21 Jun 2012 09:12:33 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201206210912.q5L9CXpt001296@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 21 Jun 2012 09:12:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237364 - projects/pf/head/sys/contrib/pf/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jun 2012 09:12:34 -0000

Author: glebius
Date: Thu Jun 21 09:12:33 2012
New Revision: 237364
URL: http://svn.freebsd.org/changeset/base/237364

Log:
  Finish what leaked into r237363:
  - remove the sx lock for pf_ioctl(). I believe correct use
    of PF_RULES_WLOCK() is sufficient to protect concurrent
    ioctl() calls from each other.
  - inline init_pf_mutex/destroy_pf_mutex.

Modified:
  projects/pf/head/sys/contrib/pf/net/pf.c

Modified: projects/pf/head/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf.c	Thu Jun 21 09:08:11 2012	(r237363)
+++ projects/pf/head/sys/contrib/pf/net/pf.c	Thu Jun 21 09:12:33 2012	(r237364)
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/kthread.h>
 #include <sys/lock.h>
-#include <sys/sx.h>
 #include <sys/taskqueue.h>
 
 #include <sys/md5.h>