From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 20 14:22:39 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 453D1106566C;
	Wed, 20 Jun 2012 14:22:39 +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 3163F8FC1A;
	Wed, 20 Jun 2012 14:22:39 +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 q5KEMdxJ047348;
	Wed, 20 Jun 2012 14:22:39 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5KEMc23047346;
	Wed, 20 Jun 2012 14:22:38 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201206201422.q5KEMc23047346@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 20 Jun 2012 14:22:38 +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: r237312 - 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: Wed, 20 Jun 2012 14:22:39 -0000

Author: glebius
Date: Wed Jun 20 14:22:38 2012
New Revision: 237312
URL: http://svn.freebsd.org/changeset/base/237312

Log:
  Don't use locking in the clone destroy routine.

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

Modified: projects/pf/head/sys/contrib/pf/net/if_pfsync.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Wed Jun 20 14:19:55 2012	(r237311)
+++ projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Wed Jun 20 14:22:38 2012	(r237312)
@@ -362,7 +362,6 @@ pfsync_clone_destroy(struct ifnet *ifp)
 	 * drain callouts.
 	 */
 relock:
-	PFSYNC_LOCK(sc);
 	while (sc->sc_deferred > 0) {
 		struct pfsync_deferral *pd = TAILQ_FIRST(&sc->sc_deferrals);
 	
@@ -374,7 +373,6 @@ relock:
 			free(pd, M_PFSYNC);
 		} else {
 			pd->pd_refs++;
-			PFSYNC_UNLOCK(sc);
 			callout_drain(&pd->pd_tmo);
 			free(pd, M_PFSYNC);
 			goto relock;