From owner-svn-src-projects@FreeBSD.ORG  Mon Jun  4 11:51:18 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0390B106564A;
	Mon,  4 Jun 2012 11:51:18 +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 E22968FC15;
	Mon,  4 Jun 2012 11:51:17 +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 q54BpHgb039540;
	Mon, 4 Jun 2012 11:51:17 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q54BpHYs039537;
	Mon, 4 Jun 2012 11:51:17 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201206041151.q54BpHYs039537@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 4 Jun 2012 11:51:17 +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: r236557 - 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: Mon, 04 Jun 2012 11:51:18 -0000

Author: glebius
Date: Mon Jun  4 11:51:17 2012
New Revision: 236557
URL: http://svn.freebsd.org/changeset/base/236557

Log:
  Add missing locking to pfsync_timeout().

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	Mon Jun  4 11:24:03 2012	(r236556)
+++ projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Mon Jun  4 11:51:17 2012	(r236557)
@@ -2191,7 +2191,9 @@ pfsync_timeout(void *arg)
 	struct pfsync_softc *sc = arg;
 
 	CURVNET_SET(sc->sc_ifp->if_vnet);
+	PFSYNC_LOCK(sc);
 	pfsync_push(sc);
+	PFSYNC_UNLOCK(sc);
 	CURVNET_RESTORE();
 }